timestamp fix, markup formatting