Misc changes, wishing I could get sounds to work at lower volumes.
Made some more User properties private.
Merge branch 'master' into production