Misc bug fixes
Many bug fixes and additions.
Merge branch 'volume-dashboard'