fix some comments and alignment