geoclicker done + changes in framework