Fixed served checking

Well for some reason these changes seem to have worked, please say if
anyone spots a double served card, though I didnt and I just ran through
10 times. Yay