a few updates and fixes
Merge branch 'master' into modular