Correct weird bug in sizing the data (due to using arange)
Switch to my simpler Match function
A few minor touch-ups to the notebook