first draft follower lookup wiring
tidying up a bit