fixed servereal open issues