fixes + including plot