Fixed lots of bugs and added map names