Update/fix comments