Cleaning up the print methods and closing out some issues.