Mapping Fixes

A whole slew of fixes, this should cover all the issues brought up except cameras. I'm doing those now.