Improve geom creation, scaling and translation