fixed some form validation issues