Moved main to better location
Minor change to plot functions args
Started plot main