Fixing package.json, testling, code updates