update package.json
a few tweaks
clean up
more tests