Formatted and added more debug logging these files.