several collision fixes
Merge branch 'dev' of https://github.com/davidbeermann/econarchy into dev