Fix switchboard function file writing placement
Add RCV passages and tweak switchboard fxn