comments added forms re-vamped