more plot fixes