Included plots, and revisited main routine