Player switching

still a bit of bug with switching after potting