more demo server polish