cleanup branch
update
various fixes
Merge branch 'master' into cleanup