Add note management module fixes #18