Fixed timestamp issue

Also improved formatting