various fixes + 1 map
Merge branch 'master' of github.com:wKLV/fluzzies