fixin server stuffs