diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..13566b8
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Editor-based HTTP Client requests
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/.idea/damn_simple_architecture.iml b/.idea/damn_simple_architecture.iml
new file mode 100644
index 0000000..7e831a2
--- /dev/null
+++ b/.idea/damn_simple_architecture.iml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="EMPTY_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/assembler/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/common/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/dsa_editor/src" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/emulator/src" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..3e8572f
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/damn_simple_architecture.iml" filepath="$PROJECT_DIR$/.idea/damn_simple_architecture.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/dsa_editor/src/highlighting.rs b/dsa_editor/src/highlighting.rs
index ecaf796..26380f5 100644
--- a/dsa_editor/src/highlighting.rs
+++ b/dsa_editor/src/highlighting.rs
@@ -1,7 +1,7 @@
 #[cfg(feature = "editor")]
 use super::Editor;
 
-use super::syntax::{Syntax, TokenType, QUOTES, SEPARATORS};
+use super::syntax::{QUOTES, SEPARATORS, Syntax, TokenType};
 use std::mem;
 
 #[derive(Default, Debug, PartialEq, PartialOrd, Eq, Ord)]
diff --git a/resources/dsa/print.dsa b/resources/dsa/print.dsa
index 3094f2e..2cf59eb 100644
--- a/resources/dsa/print.dsa
+++ b/resources/dsa/print.dsa
@@ -32,8 +32,8 @@ loop:
 	ldb rg0, acc
 	stb acc, rg1
 
-	iadd rg0, 1
-	iadd rg1, 1
+	addi rg0, 1
+	addi rg1, 1
 
     cmp acc, zero
 	jne loop
diff --git a/resources/dsa/test.dsa b/resources/dsa/test.dsa
index 8287ed0..e9e9caa 100644
--- a/resources/dsa/test.dsa
+++ b/resources/dsa/test.dsa
@@ -1,5 +1,5 @@
-include print "print.dsa"
-include fib "fib.dsa"
+include print "./print.dsa"
+include fib "./fib.dsa"
 
 dw stack: 0x10000
 db string: "An idiot admires complexity, a genius admires simplicity, 
diff --git a/resources/dsb/test.dsb b/resources/dsb/test.dsb
index a0cae0f..853ca21 100644
Binary files a/resources/dsb/test.dsb and b/resources/dsb/test.dsb differ