Improved and corrected dot format output