fixed the validation plus some changes to the schema