Improved adding notes, minor fixes