various changes
merge
Merge branch 'differentmats' of https://github.com/abardam/ghost-system into differentmats