Improved map generator.