GEO lib projection changes / updates

This is now harmonized. @DrTon Please review - it now retains the interfaces you wanted.