server stuff
server fixes