small update on comment structure and some more infos