notes and manifest tweak