fixed rebaseline bug and tidied plots