fix up my screw ups in form refactor