Lots of fixes to the Nominations and Rock the Vote extended versions