improve comments and messages