Fixed some comments and output text