various fixes, extra validations