Update/fix some comments