Shuffle around some docs
Drop the dummy options from examples, fix basic