Move tracking to player-calcs, sundry tidying