various small cleanups
shorten BtcWallet a little
small cleanup