minor edits & adjustments
Merge pull request #5 from genghisjahn/more_fixes

minor edits & adjustments