Fixed per github feedback.
Also, to prevent a repeat of yesterday's crash trouble, disabled the mode switch, so that those working on the rave mode can enable it locally for testing.
Merge pull request #789 from machinelevel/dev4

Fixed per github feedback.