Fixes

Changed "account" for "wallet", fixed some mistaken variable names.