Added total tracked time & small rename's