Minor tweaks and comments