add and remove some comments, should the header line be word wrapped or cliped?