after some plot fixes