Map Fixes

Should be working now (it better be… )