client + some fix