New fixes. Topup wallet prototype