feat(#61, #59): new features and minor improvements