Marked up a bit of the demo server