diff --git a/firmware/src/commands.c b/firmware/src/commands.c
index 5132acb..6b38a85 100644
--- a/firmware/src/commands.c
+++ b/firmware/src/commands.c
@@ -36,29 +36,29 @@ void executeCommand(CommandLine cmdLine) {
     }
     else {
         // unknown command: return error message
-        uartPutLine("ERR invalid command");
+        uartPutString("ERR invalid command\r\n");
     }
 }
 
 void commandInit() {
     // TODO init... or something?
-    uartPutLine("OK");
+    uartPutString("OK\n");
 }
 
 void commandRead(char* arg) {
     if (arg == NULL) {
-        uartPutLine("ERR READ needs an address or address range");
+        uartPutString("ERR READ needs an address or address range\r\n");
         return;
     }
 
     // Parse address(es)
     AddressRange range = parseAddressRange(arg);
     if (!range.isValid) {
-        uartPutLine("ERR invalid address format");
+        uartPutString("ERR invalid address format\r\n");
         return;
     }
 
-    uartPutLine("OK");
+    uartPutString("OK\n");
 
     uint8_t byteBuffer[DATA_BLOCK_SIZE];
     DataBuffer buffer = {
@@ -83,30 +83,30 @@ void commandRead(char* arg) {
             uartPutString(outBuffer);
         }
 
-        uartPutLine(NULL);
+        uartPutChar('\n');
     } while (buffer.bytes > 0);
 }
 
 void commandWrite(char* arg) {
     if (arg == NULL) {
-        uartPutLine("ERR WRITE needs a start address");
+        uartPutString("ERR WRITE needs a start address\r\n");
         return;
     }
 
     // Parse address
     AddressRange range = parseSingleAddress(arg);
     if (!range.isValid) {
-        uartPutLine("ERR invalid address format");
+        uartPutString("ERR invalid address format\r\n");
         return;
     }
 
     // TODO read data from input and write to EEPROM
-    uartPutLine("ERR not implemented");
+    uartPutString("ERR not implemented\n");
 }
 
 void commandErase() {
     // TODO
-    uartPutLine("ERR not implemented");
+    uartPutString("ERR not implemented\n");
 }
 
 // TESTREAD command: for testing purposes, reads a few bytes and returns them in a human readable format.
@@ -128,9 +128,7 @@ void commandTestRead() {
         uartPutChar(byte);
         uartPutString(" (0x");
         uartPutString(outBuffer);
-        uartPutString(")");
-
-        uartPutLine(NULL);
+        uartPutString(")\r\n");
     }
 }
 
@@ -156,5 +154,5 @@ void commandTestWrite(char* arg) {
     // TODO necessary?
     _delay_ms(100);
 
-    uartPutLine("TESTWRITE success");
+    uartPutString("TESTWRITE success\r\n");
 }
diff --git a/firmware/src/main.c b/firmware/src/main.c
index 056964f..70d302d 100644
--- a/firmware/src/main.c
+++ b/firmware/src/main.c
@@ -15,7 +15,7 @@ int main(void) {
     _delay_ms(100);
 
     // Write initial message via UART
-    uartPutLine("INFO -- EEPROM programmer by binaryDiv");
+    uartPutString("INFO -- EEPROM programmer by binaryDiv\r\n");
 
     while(1) {
         // Run main loop endlessly
diff --git a/firmware/src/parsing.c b/firmware/src/parsing.c
index 7df21e7..96b14a5 100644
--- a/firmware/src/parsing.c
+++ b/firmware/src/parsing.c
@@ -15,7 +15,7 @@ void parseNextCommand() {
 
     // Read next command
     CommandLine cmdLine = readNextCommand(buffer, bufferLength);
-
+    
     // Execute command
     executeCommand(cmdLine);
 }
@@ -28,7 +28,7 @@ CommandLine readNextCommand(char* buffer, uint8_t bufferLength) {
 
         if (readChars >= bufferLength - 1) {
             // Reading was aborted after bufferLength-1 characters to prevent buffer overflow.
-            uartPutLine("ERR buffer overflow, discarding line");
+            uartPutString("ERR buffer overflow, discarding line\r\n");
 
             // Discard everything until we read an actual end of line
             for (unsigned char c = 0; c != '\n' && c != '\r'; c = uartGetChar());
@@ -113,7 +113,7 @@ AddressRange parseAddressRange(char* addressStr) {
     AddressRange range = parseSingleAddress(addressStr);
 
     if (range.isValid && len == 9) {
-        if (!parseSingleAddressTo(addressStr + 5, &range.to)) {
+        if (!parseSingleAddressTo(addressStr + 4, &range.to)) {
             return (AddressRange) {false, 0, 0};
         }
     }
diff --git a/firmware/src/uart.c b/firmware/src/uart.c
index b68bab2..aa182e3 100644
--- a/firmware/src/uart.c
+++ b/firmware/src/uart.c
@@ -46,14 +46,6 @@ void uartPutString(char* data) {
     }
 }
 
-// Transmit a string followed by a line break
-void uartPutLine(char* data) {
-    if (data) {
-        uartPutString(data);
-    }
-    uartPutChar('\n');
-}
-
 // Receive a single character (blocking)
 unsigned char uartGetChar() {
     // Block until a character has been received
diff --git a/firmware/src/uart.h b/firmware/src/uart.h
index b47c953..9be2f7e 100644
--- a/firmware/src/uart.h
+++ b/firmware/src/uart.h
@@ -13,9 +13,6 @@ void uartPutChar(unsigned char data);
 // Transmit a string
 void uartPutString(char* data);
 
-// Transmit a string followed by a line break
-void uartPutLine(char* data);
-
 // Read a single character (blocking)
 unsigned char uartGetChar();