Folding options, comments and other small modifications.