some more GD presets and a small restructuring