Updated printing routines