fixes and simplification for sake.npm