A few small changes to the wb2xxx functions to make the output more generally useful. First step towards the next version.