minor comments and changes