Ethan misc small changes
Pull changes from hq
Merge branch 'master' into pulling-changes