fixed up some validation