add tests & voters & fixes/improvements