minor design changes
Merge branch 'master' into next