Fixed some comments and printounts