fixed for terminology, & server/port