updated validation and removed old form from comments