Add more timer.
Fix Issue #126.
Some formatting fixes.