Map Improvements and Script Update