Update master docs.
Fix up some routing problems.