Comment/doc tweaks