Merge from jon
More Input Improvements
Rhythm Section "Finished"