more fixes and tweaks, with testnet beta approaching