fixed comments and printing