wip
(some) adjustments based on HoundCI