fix: bugs and simplifications
9 files changed