* Namespace and description fixes.
* Misc updates.