Bug fixes and new map