Collapsible: improve comments, small bugfixes