More finishing touches on the server side