last minute tweaks
Merge branch 'master' of https://github.com/c4hrva/cbf-clean
more last minute tweaks