andr-ew fix note functions