Updating my fork to master

Cleans up scraps in some places, contains lots of map updates.