changed some server stuff
merged