diff --git a/euclid/helpers/AgentConvo.py b/euclid/helpers/AgentConvo.py
index 870fac1..9042aab 100644
--- a/euclid/helpers/AgentConvo.py
+++ b/euclid/helpers/AgentConvo.py
@@ -51,7 +51,7 @@ class AgentConvo:
         if isinstance(message_content, list):
             if len(message_content) > 0 and isinstance(message_content[0], dict):
                 string_response = [
-                    f'#{i + 1}\n' + array_of_objects_to_string(d)
+                    f'#{i}\n' + array_of_objects_to_string(d)
                     for i, d in enumerate(message_content)
                 ]
             else:
diff --git a/euclid/helpers/agents/Developer.py b/euclid/helpers/agents/Developer.py
index 4538add..7367c91 100644
--- a/euclid/helpers/agents/Developer.py
+++ b/euclid/helpers/agents/Developer.py
@@ -43,7 +43,6 @@ class Developer(Agent):
             "user_tasks": self.project.user_tasks,
             "technologies": self.project.architecture,
             "array_of_objects_to_string": array_of_objects_to_string,
-            # TODO remove hardcoded folder path
             "directory_tree": self.project.get_directory_tree(),
             "current_task_index": current_task_index,
             "sibling_tasks": sibling_tasks,
diff --git a/euclid/prompts/development/implement_changes.prompt b/euclid/prompts/development/implement_changes.prompt
index bce10e3..c415418 100644
--- a/euclid/prompts/development/implement_changes.prompt
+++ b/euclid/prompts/development/implement_changes.prompt
@@ -1,7 +1,7 @@
 {% if files|length > 0 %}
 Here is how files look now:
 {% for file in files %}
-**{{ file.name }}**
+**{{ file.path }}**
 ```{# file.language #}
 {{ file.content }}
 ```
diff --git a/euclid/prompts/development/task/next_step.prompt b/euclid/prompts/development/task/next_step.prompt
index 52ce999..f75fd9a 100644
--- a/euclid/prompts/development/task/next_step.prompt
+++ b/euclid/prompts/development/task/next_step.prompt
@@ -3,7 +3,11 @@ So far, steps {{ finished_steps }} are finished so let's do
 {% else %}
 Let's start with the
 {% endif %}
- step #{{ step_index }} - `{{ step_description }}`. This step by step about what needs to be done to fulfill this step. 
+step #{{ step_index }}:
+```
+{{ step_description }}
+```
+This step by step about what needs to be done to fulfill this step. 
 {% if step_type == 'COMMAND' %}
 Respond with all commands that need to be run to fulfill this step. In case this is a complex step that can't be completed by only running commands (maybe it requires some code changes or user review), respond with an array with only one item `COMPLEX`. Like this - `[{"command": "COMPLEX", "timeout": 0}]`
 {% elif step_type == 'CODE_CHANGE' %}