fix: address PR review follow-ups — rebase, parity, tests, safety view more