More polishing
Server very clean now