Comments, tweaks