assorted goodness
Merge pull request #279 from SGA-Brookshire/master

assorted goodness