refactor geography module/spec
fix merge conflicts
change error message output
fix merge conflicts