Added swap type to output (and corrected the outlining of the MSx mark
times).