update how geometry works, remove ^geometry map, move some defaults, update deps