corrected switch statements, case #’s