improved cli, improved server