Comments and tweaks.