fixed most issues
Merge pull request #15 from dcornnell/issues

fixed most issues