Added form completion and sanitation