more comments fixes