Some bug fixes, and new map