Note and heading tweaks