Minor fixes and print text adjustments