A little bit of clean-up on the server-side. Now the client-side needs to get nice and working.