fixes on the client and server side
sub-demo release