latest tweaks with notes2