changes and bugfixes to get ready for movement and combat
Merge branch 'working'