diff --git a/4ed_file_view.cpp b/4ed_file_view.cpp
index c47344b6..895310e0 100644
--- a/4ed_file_view.cpp
+++ b/4ed_file_view.cpp
@@ -9,7 +9,7 @@
 
 // TOP
 
-#define VWHITE 1
+#define VWHITE 0
 
 internal i32
 get_or_add_map_index(Models *models, i32 mapid){
@@ -998,6 +998,7 @@ file_measure_wraps(Models *models, Editing_File *file, f32 font_height, f32 *adv
     file_allocate_indents_as_needed(&models->mem.general, file, file->state.buffer.line_count);
     file_allocate_wrap_positions_as_needed(&models->mem.general, file, file->state.buffer.line_count);
     
+    
     Buffer_Measure_Wrap_Params params;
     params.buffer          = &file->state.buffer;
     params.wrap_line_index = file->state.wrap_line_index;
@@ -1005,6 +1006,8 @@ file_measure_wraps(Models *models, Editing_File *file, f32 font_height, f32 *adv
     params.width           = (f32)file->settings.display_width;
     params.virtual_white   = VWHITE;
     
+    i32 size = buffer_size(params.buffer);
+    
     Buffer_Measure_Wrap_State state = {0};
     Buffer_Layout_Stop stop = {0};
     
@@ -1026,6 +1029,52 @@ file_measure_wraps(Models *models, Editing_File *file, f32 font_height, f32 *adv
         switch (stop.status){
             case BLStatus_NeedWrapDetermination:
             {
+                Buffer_Stream_Type stream = {0};
+                
+                i32 stage = 0;
+                i32 i = stop.pos;
+                f32 x = stop.x;
+                if (buffer_stringify_loop(&stream, params.buffer, i, size)){
+                    b32 still_looping = 0;
+                    do{
+                        for (; i < stream.end; ++i){
+                            char ch = stream.data[i];
+                            
+                            switch (stage){
+                                case 0:
+                                {
+                                    if (char_is_whitespace(ch)){
+                                        stage = 1;
+                                    }
+                                }break;
+                                
+                                case 1:
+                                {
+                                    if (!char_is_whitespace(ch)){
+                                        goto doublebreak;
+                                    }
+                                }break;
+                            }
+                            
+                            x += params.adv[ch];
+                        }
+                        still_looping = buffer_stringify_next(&stream);
+                    }while(still_looping);
+                }
+                doublebreak:;
+                wrap_unit_end = i;
+                
+                if (x > params.width){
+                    do_wrap = 1;
+                    
+                    file_allocate_wrap_positions_as_needed(&models->mem.general, file, wrap_position_index);
+                    file->state.wrap_positions[wrap_position_index++] = stop.pos;
+                }
+                else{
+                    do_wrap = 0;
+                }
+                
+#if 0
                 i32 rounded_pos = stop.pos - (stop.pos%11);
                 if ((rounded_pos % 2) == 1){
                     do_wrap = 1;
@@ -1036,6 +1085,7 @@ file_measure_wraps(Models *models, Editing_File *file, f32 font_height, f32 *adv
                     do_wrap = 0;
                 }
                 wrap_unit_end = rounded_pos + 11;
+#endif
             }break;
             
             case BLStatus_NeedWrapLineShift:
@@ -1060,7 +1110,7 @@ file_measure_wraps(Models *models, Editing_File *file, f32 font_height, f32 *adv
     ++file->state.wrap_line_count;
     
     file_allocate_wrap_positions_as_needed(&models->mem.general, file, wrap_position_index);
-    file->state.wrap_positions[wrap_position_index++] = buffer_size(&file->state.buffer);
+    file->state.wrap_positions[wrap_position_index++] = size;
     file->state.wrap_position_count = wrap_position_index;
     
     file_update_cursor_positions(models, file);
diff --git a/buffer/4coder_buffer_abstract.cpp b/buffer/4coder_buffer_abstract.cpp
index a82a3d32..7f766d75 100644
--- a/buffer/4coder_buffer_abstract.cpp
+++ b/buffer/4coder_buffer_abstract.cpp
@@ -673,10 +673,14 @@ buffer_partial_from_line_character(Buffer_Type *buffer, i32 line, i32 character)
     Partial_Cursor result = {0};
     
     i32 line_index = line - 1;
-    if (line_index >= buffer->line_count) line_index = buffer->line_count - 1;
-    if (line_index < 0) line_index = 0;
+    if (line_index >= buffer->line_count){
+        line_index = buffer->line_count - 1;
+    }
+    if (line_index < 0){
+        line_index = 0;
+    }
     
-    int32_t size = buffer_size(buffer);
+    i32 size = buffer_size(buffer);
     i32 this_start = buffer->line_starts[line_index];
     i32 max_character = (size-this_start) + 1;
     if (line_index+1 < buffer->line_count){
@@ -692,7 +696,7 @@ buffer_partial_from_line_character(Buffer_Type *buffer, i32 line, i32 character)
     }
     
     result.pos = this_start + character - 1;
-    result.line = line_index+1;
+    result.line = line_index + 1;
     result.character = character;
     
     return(result);