added lastes changes, relations validations, tests..