refactor subject pool waitlist, other minor hygiene