plotting wrong graph :(
fixing merge conflicts, cleaned up end of main