Target plot, misc fixes