Code tweaks, additional comments