Fixed all validation errors

zomg