refactor exports
fix arguments check
tweak npm args