A couple of bug fixes for the Server, and an improvement on the data parsing