fix all(most) the things - checkboxes, name & id values, remove templating