added voting fixed bugs