fixed some server side isuses