Merge pull request #254 from SGA-Brookshire/master

first pass e2-44, 45, 46, 48, 49, 50 djb
More corrections.
Merge pull request #255 from travisbrown/master

More corrections.
first pass e2-0042 djb