as well as simplifying output. Fixed terrible tab bug (This one prevented CVS messages from working right)