geo, collhelper, upload, fixes 6