Comment tweaks and fixes