fixes bugs, last edits
Merge pull request #113 from KelseyLMay/branchbug

fixes bugs, last edits