Improvements to folding/comments