some fixes on comments