Comments, small tweaks