fixes and tunings