New features, proper package.json file, fixes