fixes and demo of server feature