Add new candidates

And clean up some processing stuff.