fixed various validation things