Let me know if you need help on this. One technique I used in the past was to move all the leaving players to Punter. That way it is easier to concentrate on the players coming back and then just fill in the rest from the punter list. Just a suggestion.
Vikes - I am going to take your list of edits on page one and do them today.