finalized voting design + some design fixes + improved code