added comments and other small changes
added more comments
Merge pull request #25 from amychiu/amy/development2

Amy/development2