Merge pull request #22 from Roland410/master

Bugfixes and pretty tiny features
Small map updates
Roland, you derp.