minor changes; working server