Add support for staff tag

I added support for the staff tag within a note and did some minor refactoring.