Polishing things, and adding features to the server