Better wallet

Trying to fix some earlier mistakes.