Cleanup and fixes, just have to make sure electrum_wallet.cpp is good