Commenting and layout tweaks