geo: various changes