fixed some validation issues