-various small fixes :(
Merge branch 'master' of https://github.com/julianstengaard/TwinSpirits