Validation is now working correctly, FINALLY
Fixed validation errors