Add commenting, a couple of minor variable tweaks