More Cleanup

-Refactored the soft-reset so it actually works...
-Fixed a conditional that was missing mode switches