Comment tweaks.
WIP