Collapsible working mostly again
Minor parsing improvements