improve specs and code additional_checks