More edits
Merge pull request #4 from cfisher32/edits

More another edits, fixes #1