Mapgen & some other stuff

Improved map generation
Added some tiny stuff