Added new beeps and fixed some issues