minor switch updates based on latest run-through