neServer many fixes