a lot of work on map gen

will probably throw this all out ...