Minor changes, mostly just adding handling of fixCurPlayer.