additional fixes, improved geo support