Added additional parameters to validation check.  

Also made some minor text changes