Fixed keying issues, sped up note storage