many issues dealt with, two remaining
Merge pull request #7 from cjcjameson/issue_handling

many issues dealt with, two remaining