made small edits and added todos
Changed todo color codes and small edits
resolved conflict