more polish for server demo!