Minor modications to enable first unified algorithm.

Minor modifications to the output file format.