-fixed a bunch of validations