added volume controls and cleaned up saving to not replace Key