Fixed a few bugs, added new maps