More updates, particularly to the npm module