Improvements to print functionality