feat(#43, #44, #45): add minor general improvements