Allow section numbering. Clean up options.
updates