updated definition-header, 2 small fixes