Allow raw options to stop.

Also some doc improvements.