gl and geom improvements