Added switch support... fixed more problems with marks in the process

some cleanup

(0) -30 -10 -2 +2 +10 +30 tip

mercurial