general cleanup and fix package.json