clean up switches, prelim route PS, clean up shorts