form_validation - added more fields and did more cleanup.