just merging with patrick's push
merged versions and fixed resulting package errors also added some initial map generation