Added further options.
Deprecated.
Formatting changes.
Minor usage changes.