changes changes and more changes... oh, and worked on map extractor a bit too.