update some logging, updated client logic