Fixing some constant references.
Still need to map codes.
Merge branch 'development' of github.com:dchbx/gluedb into development