some minor functional edits
changes per PR discussion
Merge pull request #1 from daviddahl/ddahl-edits

some minor functional edits