Made things less messy, and updated the server to fit the documentation