Added handlers and improved volume functions.