And some final map fixes. Sorry about the lines changed - mapmerge didn't work properly.