cleanup and added hooks for adjusting volumes