-fixed comments abit