Merge pull request #252 from SGA-Brookshire/master

first pass e2-0040 and other tweaks djb
Small changes to identifiers.
Merge pull request #253 from travisbrown/master

Small changes to identifiers.
first pass e2-44, 45, 46, 48, 49, 50 djb