Ammended some print functions