server fixs bugs