Merge pull request #238 from SGA-Brookshire/master

first pass e2-0020 djb
first pass e2 21, 22, 26 djb