bugfixes
Merge branch 'master' into brumdebug