Various tweaks to code & comments