Updated comments and output slightly