small fixes before passing it to scott for development
Merge branch 'prep-for-scott'