typos, improvments and server test