Create module for notes and other fixes