Fixed bugs where players weren't switching properly and added mechanism to display who's up