Updated demo_server

Added some minor functionality to embedded code as well. Nothing
significant.