Added some more printing features