Bugfixes and added features (elapsed time, updated tabs, etc)