more stuff, added some things to plot script as well
plot script
merged