Simplify code for overtone server, haziti-clap for gesture, and other minor changes