Fixed player switching + minor fixes/changes