change: codebase improvements.
fix: forgot to do commit.