More improvements to vote errors and better organization