fixed order of switch$ to check first, and added return.

Dammit I knew I forgot that one :(