More minor updates
Merge pull request #3 from UncleDozer/master

More minor updates