Add volume control + looping