Add neutral players, fix selection