Server improvements
Finished the server