Updated MapGenerator and MapRenderer