Small router fixes.
Added cli and client.