Added outline for buzzer control

Also lots of cleaning up