Comments nesting fixes. Limited deep