some minor changes in Klient