add-deferred-debt

Add deferred technical debt items identified during PR review