added some extra server stuff