Added a running indicator and fixed bugs.