refactoring
ready for demo
bug fix for buzzer