merge in missing stuff from the mapstory branch, now that this development has settled down