moved plots and small changes