Added some world generation and tweaked the map usage