Fix also the script variant and update comments.