some changes, trying to find the damned bugs.
Mainly changes to the format of the output.