Fixed up some things
Merge branch 'tryingToAddNotes'