adding server cli, fixing bugs, ignore previous commit :B