fixed up some validation stuff