Added click demo, waves, and minor clean ups