Feature/refinements before npm publish