I'll do up a new map-edit off the base map after work, and try to get everyone where they are supposed to be.