fixes bugs
Merge pull request #116 from KelseyLMay/branchalmostthere

fixes bugs