Fixing Catkin migration issues.  Also, minor bugs.
Adds some functions for use without a midi controller