Added lots of comments to the Server. Renamed a function in both