fixed a few bugs from list
Merge pull request #121 from jeanineann/fixes

fixed a few bugs from list