CS fixes.
Better namespacing for commands.
Restart command correction, and prune before killing.