Added timer.
Did some minor tweaks.