fixed validation stuff