Major Switch Fix (And Other Bug Comments)
(Probably Didn't Need to Delete test.html)