Added support for geo and quad codes.  Minor refactors