multiple tweaks & comments