update with all sorts of debug stuff
fix annoying plotting bug