Updates to spec and config.  Some bits come up.