minor tuning adjustments and one fix to timer.