Fix, adjust plots
