update several files to work with Plot