comments and fixes
Merge pull request #36 from MadeleineKolb/ownBranch2

comments and fixes