Minor tweaks and comments
Minor tweaks