Improve cli/srv. fix bugs. improve display