Fixes for the switch command

Great example of commenting done right! :heart_eyes: