Tiny fixes and experiments, package.json update