Improve Server robustness

Server should be able to reset itself