Bug fixes.
Tuning timing.