Bug fixes

Fixed error in data subsetting that was causing the wrong data to be
plotted.