some changes on comments calc