tweaks to constant names, handling, etc
Merge pull request #464 from jessevondoom/master

tweaks to constant names, handling, etc