Comments/minor tweaks