package.json
testing + bug fixes