Documentation work.  Some optimization.