Merge pull request #6 from alecjohanson/alecjohanson

Trivial changes
Merge pull request #7 from alecjohanson/alecjohanson

oops
Merge pull request #8 from alecjohanson/alecjohanson

AddNoteToPlayer
fix compile errors