Changed minor bug with switch-controller link and startup bugs