Comments and tweaks