Added CommandDie. Some client/server changes