Map Fixes and Additions