Small improvements, updated package.json