Big fixes for determining player ordering