misc work
Merge branch 'restructure' of https://github.com/aj-r/uwgame into restructure
implement map update function
fix merge conflicts