Some bug fixes and a drum loop