Feature/wallet client improvements