Fixed bug introduced in the refactor, and several little improvements
Finish volume controls
Merge branch 'master' into gh-pages