fixes and tuning