Minor controller cleanup and add devType to NavEvents as well.
Implement a quick fix for quiting with instruments in non-instrument songs. Closes #69. Needs testing.