fixes: various

Makefile, package.json and other minor fixes and enhancements