first pass e2-0040 and other tweaks djb
Merge pull request #252 from SGA-Brookshire/master

first pass e2-0040 and other tweaks djb