added some more server stuff