some minor fixes and more presets