tweak some comments and messages