several bug fixes
Merge branch 'master' of github.com:dasmaeh/cbjck3