More and fixes & packages.json file