some minor tuning