Added more maps, cleaned up a little