Enable folding
Minor tweaks