Cleanup...
Fixes #52 partially. We'll still have problems with the switches.