masoud's switch fixups

attempting to apply @koleini switch fixups to latest @crotsos tree, while also updating and sorting out `oasis` runes

UNTESTED