fixes
working on validations