More commenting and tweaks