Reorganized map generation and added wandering.