Tidy up a few comments. Fix activity switch conditionals and add a default fall back for unknown value.