notice fixes and indentation
form rule fixes and js cleanup
incorrect activity fixes