Better Note State switch, and fixed exceptions
Merge branch 'master' of https://github.com/Skymirrh/Pop-n-Touch