Add/fix comments