Numerous fixes to presets...