change: small bugfixes, and finishing validations