fix a couple of bugs
and start on a cleanup candidates page