fixed some validation stuff