fixes and preparing for voter