Comments, minor tweaks