minor fixes and improvements
Merge branch 'master' of https://github.com/dunnololda/scage