Fixed bug and updated map list
Cleaned up a bit...