Allow for geometry shader and tidy up a bit