fixed server and logging