Comment hierarchie implemented
Small changes