diff --git a/HW7/.idea/workspace.xml b/HW7/.idea/workspace.xml
index f808fad..1647c8e 100644
--- a/HW7/.idea/workspace.xml
+++ b/HW7/.idea/workspace.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="AnalysisUIOptions">
+    <option name="SCOPE_TYPE" value="3" />
+  </component>
   <component name="BuildServerSettings">
     <option name="LOGIN" value="" />
     <option name="SERVER_URL" value="http://buildserver" />
@@ -37,8 +40,6 @@
   <component name="ChangeListManager">
     <list default="true" id="2c8533ba-540f-4e3f-9945-3ca06f59f247" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/main.dir/depend.make" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/CMakeFiles/main.dir/depend.make" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/cmake-build-debug/main" beforeDir="false" afterPath="$PROJECT_DIR$/cmake-build-debug/main" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/main.cpp" beforeDir="false" afterPath="$PROJECT_DIR$/main.cpp" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -71,7 +72,7 @@
     <property name="node.js.selected.package.eslint" value="(autodetect)" />
     <property name="node.js.selected.package.tslint" value="(autodetect)" />
     <property name="run.code.analysis.last.selected.profile" value="pProject Default" />
-    <property name="settings.editor.selected.configurable" value="preferences.pluginManager" />
+    <property name="settings.editor.selected.configurable" value="inlay.hints.ObjectiveC" />
   </component>
   <component name="RunManager">
     <configuration name="main" type="CMakeRunConfiguration" factoryName="Application" PASS_PARENT_ENVS_2="true" PROJECT_NAME="HW7" TARGET_NAME="main" CONFIG_NAME="Debug" RUN_TARGET_PROJECT_NAME="HW7" RUN_TARGET_NAME="main">
@@ -93,6 +94,7 @@
       <workItem from="1584397996277" duration="646000" />
       <workItem from="1584399419332" duration="1165000" />
       <workItem from="1584410030817" duration="3105000" />
+      <workItem from="1584418360198" duration="1236000" />
     </task>
     <servers />
   </component>
@@ -104,10 +106,10 @@
       <screen x="0" y="0" width="1920" height="1080" />
     </state>
     <state x="648" y="275" key="#com.intellij.openapi.updateSettings.impl.PluginUpdateInfoDialog/0.0.1920.1080/-1920.135.1920.1080/1920.97.1920.1080@0.0.1920.1080" timestamp="1584399404367" />
-    <state x="712" y="403" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1" timestamp="1584418407417">
+    <state x="712" y="403" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1" timestamp="1584419433375">
       <screen x="0" y="0" width="1920" height="1080" />
     </state>
-    <state x="712" y="403" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1/0.0.1920.1080/-1920.135.1920.1080/1920.97.1920.1080@0.0.1920.1080" timestamp="1584418407417" />
+    <state x="712" y="403" key="ANALYSIS_DLG_com.intellij.analysis.BaseAnalysisAction$1/0.0.1920.1080/-1920.135.1920.1080/1920.97.1920.1080@0.0.1920.1080" timestamp="1584419433375" />
     <state width="1878" height="357" key="GridCell.Tab.0.bottom" timestamp="1584417673541">
       <screen x="0" y="0" width="1920" height="1080" />
     </state>
@@ -144,10 +146,10 @@
       <screen x="0" y="0" width="1920" height="1080" />
     </state>
     <state width="1878" height="357" key="GridCell.Tab.1.right/0.0.1920.1080/-1920.135.1920.1080/1920.97.1920.1080@0.0.1920.1080" timestamp="1584417673543" />
-    <state x="469" y="179" key="SettingsEditor" timestamp="1584418565619">
+    <state x="469" y="179" key="SettingsEditor" timestamp="1584419373854">
       <screen x="0" y="0" width="1920" height="1080" />
     </state>
-    <state x="469" y="179" key="SettingsEditor/0.0.1920.1080/-1920.135.1920.1080/1920.97.1920.1080@0.0.1920.1080" timestamp="1584418565619" />
+    <state x="469" y="179" key="SettingsEditor/0.0.1920.1080/-1920.135.1920.1080/1920.97.1920.1080@0.0.1920.1080" timestamp="1584419373854" />
     <state x="469" y="179" key="SettingsEditor/0.0.1920.1080/-1920.158.1920.1057/1920.120.1920.1057@0.0.1920.1080" timestamp="1584418349102" />
     <state x="653" y="368" key="com.intellij.ide.util.TipDialog" timestamp="1584418360381">
       <screen x="0" y="0" width="1920" height="1080" />
diff --git a/HW7/main.cpp b/HW7/main.cpp
index 28157db..0969f36 100644
--- a/HW7/main.cpp
+++ b/HW7/main.cpp
@@ -3,6 +3,7 @@
 #include<stdlib.h>
 #include<time.h>
 #include<queue>
+
 #define MCW MPI_COMM_WORLD
 #define GENERIC 0
 #define SPECIAL 1
@@ -29,53 +30,53 @@ int main(int argc, char **argv) {
     MPI_Comm_rank(MCW, &rank);
     MPI_Comm_size(MCW, &size);
 
-    srand(time(NULL)+rank);
+    srand(time(NULL) + rank);
     taskLimit = rand() % 1025 + 1024; //Set the limit to some number between 1024 and 2048
 
-    if(rank == 0) {
+    if (rank == 0) {
         hasToken = true;
         int job = rand() % 3 + 1;
         tasksCreated++;
         MPI_Send(&job, 1, MPI_INT, rand() % 4, JOB, MCW); //Send out the initial job
     }
 
-    while(true) {
+    while (true) {
         MPI_Iprobe(MPI_ANY_SOURCE, JOB, MCW, &jobFlag, &status); //Check to see if a job is available
-        if(jobFlag) {
+        if (jobFlag) {
             MPI_Irecv(&newTask, 1, MPI_INT, MPI_ANY_SOURCE, JOB, MCW, &request);
             myTasks.push(newTask);
         }
-        if(newTask == -1) { //If the stop signal is received, send my info to process 0 and break out of the loop
-            MPI_Send(&tasksCreated, 1, MPI_INT, 0, size-1, MCW);
+        if (newTask == -1) { //If the stop signal is received, send my info to process 0 and break out of the loop
+            MPI_Send(&tasksCreated, 1, MPI_INT, 0, size - 1, MCW);
             MPI_Send(&tasksCompleted, 1, MPI_INT, 0, size, MCW);
             break;
         }
-        if(myTasks.size() > 16) { //If my task queue is greater than size 16, send off 2 tasks
-            for(int i = 0; i < 2; i++) {
+        if (myTasks.size() > 16) { //If my task queue is greater than size 16, send off 2 tasks
+            for (int i = 0; i < 2; i++) {
                 int task = myTasks.front();
                 myTasks.pop();
                 int dest = rand() % 4;
-                while(dest == rank) {dest = rand() % size;}
-                if(dest < rank) { myToken = GENERIC;}
+                while (dest == rank) { dest = rand() % size; }
+                if (dest < rank) { myToken = GENERIC; }
                 MPI_Send(&task, 1, MPI_INT, dest, JOB, MCW);
             }
         }
-        if(!myTasks.empty()) {
+        if (!myTasks.empty()) {
             int num = myTasks.front();
             myTasks.pop();
-            num^3-num^4;
+            num ^ 3 - num ^ 4;
             tasksCompleted++;
         }
-        if(tasksCreated < taskLimit) {
-            for(int i = 0; i < rand() % size; i++) {
+        if (tasksCreated < taskLimit) {
+            for (int i = 0; i < rand() % size; i++) {
                 myTasks.push(rand() % size);
                 tasksCreated++;
             }
         }
-        if(myTasks.empty()) { //Check the token information
-            if(hasToken) {
-                string tmp =  "";
-                if(tokenValue == GENERIC)
+        if (myTasks.empty()) { //Check the token information
+            if (hasToken) {
+                string tmp = "";
+                if (tokenValue == GENERIC)
                     tmp = "Generic";
                 else
                     tmp = "Special";
@@ -83,25 +84,28 @@ int main(int argc, char **argv) {
 
                 cout << "My Rank: " << rank << "     My token: " << tmp << endl;
                 int dest = rank + 1 < size ? rank + 1 : 0;
-                if(rank == 0) { tokenValue = SPECIAL;}
+                if (rank == 0) { tokenValue = SPECIAL; }
                 MPI_Send(&tokenValue, 1, MPI_INT, dest, TOKEN, MCW);
                 hasToken = false;
                 myToken = SPECIAL;
-            }
-            else {
-                int src = rank - 1 >= 0 ? rank - 1 : size - 1;
+            } else {
+                int src = 0;
+                if(rank - 1 >= 0)
+                    src = rank - 1;
+                else
+                    src = size - 1;
                 MPI_Iprobe(src, TOKEN, MCW, &tokenFlag, &status);
-                if(tokenFlag) {
+                if (tokenFlag) {
                     MPI_Irecv(&tokenValue, 1, MPI_INT, src, TOKEN, MCW, &request);
                     hasToken = true;
-                    if(rank == 0 && tokenValue == SPECIAL) {
-                        int globalStop = -1;
-                        for(int i = 1; i < size; i++) {
-                            MPI_Send(&globalStop, 1, MPI_INT, i, JOB, MCW);
+                    if (rank == 0 && tokenValue == SPECIAL) {
+                        int Stop = -1;
+                        for (int i = 1; i < size; i++) {
+                            MPI_Send(&Stop, 1, MPI_INT, i, JOB, MCW);
                         }
                         break;
                     }
-                    if(myToken == GENERIC) {
+                    if (myToken == GENERIC) {
                         tokenValue = GENERIC;
                     }
                 }
@@ -109,19 +113,19 @@ int main(int argc, char **argv) {
         }
     }
 //Print info after run.
-    if(rank == 0) {
+    if (rank == 0) {
         int created;
         int completed;
-        cout<<"Rank 0 created "<<tasksCreated<<" tasks and completed "<<tasksCompleted<<" tasks"<<endl;
-        for(int i = 0; i < size; i++) {
-            MPI_Recv(&created, 1, MPI_INT, i, size -1, MCW, MPI_STATUS_IGNORE);
+        cout << "Rank 0 created " << tasksCreated << " tasks and completed " << tasksCompleted << " tasks" << endl;
+        for (int i = 0; i < size; i++) {
+            MPI_Recv(&created, 1, MPI_INT, i, size - 1, MCW, MPI_STATUS_IGNORE);
             MPI_Recv(&completed, 1, MPI_INT, i, size, MCW, MPI_STATUS_IGNORE);
-            cout<<"Rank "<<i<<" created "<<created<<" tasks and completed "<<completed<<" tasks"<<endl;
+            cout << "Rank " << i << " created " << created << " tasks and completed " << completed << " tasks" << endl;
             tasksCreated += created;
             tasksCompleted += completed;
         }
-        cout<<"Tasks Created: "<<tasksCreated<<endl;
-        cout<<"Tasks Completed: "<<tasksCompleted<<endl;
+        cout << "Tasks Created: " << tasksCreated << endl;
+        cout << "Tasks Completed: " << tasksCompleted << endl;
     }