Add Volume Control
Fix minor problems