added geo behaviour, bugfixes