A whole bunch of prep for the voting mechanism. Some adjustments in language, additions to, and reworking parts of the templates.