bug fix improve comments