Added a few maps from #1200
Fixed #825
Fixed #1212
Fixed ##1211