fixed start-server and added stop-server.