-Minor fixes (found and solved some TODO's)
-Introduced a circular progress indicator for elapsed time.