minor fixes
Merge branch 'master' of github.com:hotwolf/S12CBase
work in progress