base type server and client changes, fixing some logger changes too