fixes and tuning during real deployment