diff --git a/src/hex.c b/src/hex.c
index 634fb6a..62e2dd7 100644
--- a/src/hex.c
+++ b/src/hex.c
@@ -11,7 +11,7 @@ void init_flags(struct flags* flags)
 {
 	flags->autoskip = false;
 	flags->binary = false;
-	flags->cols = 16;
+	flags->cols = 4;
 	flags->octets = 2;
 	flags->len = -1; // -1 means til EOF
 	flags->uppercase = false;
@@ -27,18 +27,18 @@ void free_hex_chunk(hex_chunk_t* chunk)
 
 void add_text_to_chunk(char* src, char** dst)
 {
-	*dst = malloc(sizeof(char) * (TEXT_LINE_LEN + 1));
+	*dst = malloc(sizeof(char) * (flags.cols + 1));
 
-	strncpy(*dst, src, 16);
+	strncpy(*dst, src, flags.cols);
 	(*dst)[TEXT_LINE_LEN] = '\0';
 }
 
 void convert_text_to_hex(hex_chunk_t* chunk)
 {
-	int i, j;
-	chunk->hex = malloc(sizeof(char) * (HEX_LINE_LEN + 1));
+	uint i, j;
+	chunk->hex = malloc(sizeof(char) * ((flags.cols * 2) + 1));
 	
-	for (i = 0, j = 0; i < HEX_LINE_LEN; i += 2, j += 1) {
+	for (i = 0, j = 0; i < (flags.cols * 2); i += 2, j += 1) {
 		if (chunk->text[j] == '\0') {
 			snprintf(chunk->hex + i, 3, "  ");
 		} else {
@@ -49,10 +49,10 @@ void convert_text_to_hex(hex_chunk_t* chunk)
 
 void display_hex_chunk(hex_chunk_t* chunk, FILE* stream)
 {
-	int i, j;
+	uint i, j;
 
-	fprintf(stream, "%08x: \x1b[32m", chunk->line * 16);
-	for (i = 0; i < HEX_LINE_LEN; i += 4) {
+	fprintf(stream, "%08x: \x1b[32m", chunk->line * flags.cols);
+	for (i = 0; i < (flags.cols * 2); i += 4) {
 		for (j = 0; j < 4; j += 2) {
 			if (((chunk->hex + i) + j)[0] == '0' && ((chunk->hex + i) + j)[1] == 'a')
 				fprintf(stream, "\x1b[33m%2.2s\x1b[32m", chunk->hex + i + j);
@@ -62,7 +62,7 @@ void display_hex_chunk(hex_chunk_t* chunk, FILE* stream)
 		fprintf(stream, " ");
 	}
 
-	for (i = 0; i < TEXT_LINE_LEN; i++) {
+	for (i = 0; i < flags.cols; i++) {
 		if (chunk->text[i] == '\n' || chunk->text[i] == EOF)
 			fprintf(stream, "\x1b[33m.\x1b[32m");
 		else
diff --git a/src/main.c b/src/main.c
index d88d58d..c174f19 100644
--- a/src/main.c
+++ b/src/main.c
@@ -6,19 +6,19 @@
 #include "include/hex.h"
 #include "include/file.h"
 
+struct flags flags;
+
 int get_hex_lines(int len)
 {
 	int out;
 
-	out = len / 16;
-	if (len % 16 != 0) // if we have a less than a full line remaining
+	out = len / (flags.cols);
+	if (len % (flags.cols) != 0) // if we have a less than a full line remaining
 		out++;
 
 	return out;
 }
 
-struct flags flags;
-
 int main(int argc, char* argv[])
 {
 	char* file_content;
@@ -42,7 +42,6 @@ int main(int argc, char* argv[])
 		outfile = true;
 	}
 
-
 	read_file_to_buf(argv[1], &file_content);
 
 	filesize = (flags.len == -1) ? strlen(file_content) : flags.len;
@@ -54,7 +53,7 @@ int main(int argc, char* argv[])
 	for (i = 0; i < hex_lines; i++) {
 		lines[i].line = i;
 	
-		add_text_to_chunk(file_content + (i * 16), &(lines[i].text));
+		add_text_to_chunk(file_content + (i * (flags.cols)), &(lines[i].text));
 		convert_text_to_hex(&lines[i]);
 	}