Merge in stack for miscellanious improvements

[dnbaker]

Small changes scattered throughout, bmftools stack isn't ready for primetime, but I needed the other things I'd cleaned up along the way.