adding colors, last touch to beat detection and some cleanup