comments: some fixes