Merge pull request #196 from meganap/agut

checking in field validation changes
checking in js fixes