geo service and file service improvements.