Fixed a couple of bugs in data munging and data viz