updates after reviewing Fabios remarks

1 files changed, 37 insertions, 28 deletions

diff --git a/data/index/i2.idx b/data/index/i2.idx
index 9c32075..b2c8f24 100644
--- a/data/index/i2.idx
+++ b/data/index/i2.idx
@@ -1,13 +1,13 @@
-0*35:85*2:88*1:87*1:4*3:74*1:80*1:36*1:82*2:83*1:2*16:68*17:56*16:75*1:9*1:71*1:69*1:48*1:52*1:63*1:62*1:54*1:59*1:65*1:61*1:39*1:60*1:44*1:3*1:41*1:50*1:8*1:43*8:42*1474:40*38:38*44:34*1:21*4:20*1:18*1:10*1474:11*1474:5*1
-0*2:36*1:82*1:83*1:68*1:61*5:44*1:43*1:42*376:40*31:38*33:19*1:10*376:11*376:6*1:5*1
-0*66:85*1:86*1:4*7:82*6:83*5:68*3:79*1:76*1:63*1:61*4:39*2:60*1:44*1:58*4:55*2:53*2:41*1:50*5:8*1:43*9:42*3769:40*95:38*102:34*5:33*1:21*16:10*3769:11*3769:6*1:5*4
+0*34:85*2:88*1:87*1:4*3:74*1:80*1:36*1:82*2:83*1:2*16:68*17:56*16:75*1:9*1:71*1:69*1:48*1:52*1:63*1:62*1:54*1:59*1:65*1:61*1:39*1:60*1:44*1:3*1:41*1:50*1:8*1:43*8:42*1474:40*38:38*44:34*1:21*4:20*1:18*1:10*1474:11*1474:5*1
+0*4:36*1:82*1:83*1:68*1:61*5:44*1:43*1:42*376:40*31:38*33:19*1:10*376:11*376:6*1:5*1
+0*65:85*1:86*1:4*7:82*6:83*5:68*3:79*1:76*1:63*1:61*4:39*2:60*1:44*1:58*4:55*2:53*2:41*1:50*5:8*1:43*9:42*3769:40*95:38*102:34*5:33*1:21*16:10*3769:11*3769:6*1:5*4
 0*3:85*3
 0*34:85*1:88*5:86*1:84*7:79*3:76*3:67*2:54*1:59*1:45*8:55*13:53*12:41*75:50*84:47*3:8*1:43*1:42*448:40*22:38*21:37*2:34*84:33*37:21*24:10*448:11*448
 41*1:42*1:10*1:11*1
 0*19:71*1:54*1:59*1:21*29
 0*4:85*4
 0*16:4*4:82*2:83*1:68*1:61*2:39*1:60*1:58*2:43*4:42*1534:40*33:38*36:21*2:10*1534:11*1534
-0*10:41*1:50*3:47*1:42*2:34*3:21*4:10*2:11*2
+0*9:41*1:50*3:47*1:42*2:34*3:21*4:10*2:11*2
 0*2:85*1
 0*4
 0*2:84*1
@@ -15,7 +15,7 @@
 0*3
 0*1:85*1
 0*2:85*2:84*1
-0*11:85*1:80*1:71*1:41*3:50*9:8*2:42*12:34*9:21*1:10*12:11*12
+0*12:85*1:80*1:71*1:41*3:50*9:8*2:42*12:34*9:21*1:10*12:11*12
 0*3:42*3:10*3:11*3
 0*51:85*1:88*1:86*2:4*10:82*2:83*2:61*2:39*1:60*1:44*1:46*1:58*3:55*1:50*1:43*8:42*2513:40*84:38*95:34*1:21*18:10*2513:11*2513:6*4:5*6
 0*3:85*1:42*8:21*1:10*8:11*8
@@ -23,18 +23,18 @@
 0*5
 0*4:52*1:41*1:42*3:10*3:11*3
 0*2:50*1:42*1:34*1:21*9:20*1:10*1:11*1
-42*65:21*2:20*1:10*65:11*65
+0*1:42*65:21*2:20*1:10*65:11*65
 
-0*3:85*1:84*1:9*2:48*1:44*1:53*1:21*4
+0*4:85*1:84*1:9*2:48*1:44*1:53*1:21*4
 
 0*2:42*2:10*2:11*2
 0*5:84*2:50*2:34*2:21*1
 0*5:86*1:74*1:84*4
 
 0*5:84*1:41*1:50*5:47*5:42*5:34*5:33*1:21*1:10*5:11*5
-0*5
+0*6
 0*5:86*1:84*2:21*1
-0*3:86*1:84*1:21*3
+0*4:86*1:84*1:21*3
 0*5
 0*2:85*1:84*1
 0*1:84*1:42*1:10*1:11*1
@@ -53,14 +53,14 @@
 41*1:42*1:21*1:10*1:11*1
 0*8:86*1:45*1:21*1
 0*2
-0*2:84*1:21*2
+0*3:84*1:21*2
 0*1:84*1:42*4:33*1:21*1:10*4:11*4
 21*1
 0*1:84*1
 0*1:84*1
 
 41*1:42*2:21*1:10*2:11*2
-4*2:47*1:43*1:42*301:40*13:38*13:21*4:10*301:11*301
+0*1:4*2:47*1:43*1:42*301:40*13:38*13:21*4:10*301:11*301
 0*1:86*1
 0*1:85*1:84*1
 
@@ -82,11 +82,11 @@
 0*2
 0*2
 0*7
-0*9:85*1:86*1:50*1:34*1
+0*11:85*1:86*1:50*1:34*1
 0*15
-0*3
+0*4
 0*2:54*1:59*1
-0*1:69*2
+0*2:69*2
 0*1:4*1:2*1:21*1
 0*1:21*1
 0*1:82*1:83*1:21*1
@@ -99,13 +99,13 @@
 0*1:50*1:34*1
 
 
-0*17:85*3:88*19:86*3:84*2:79*11:76*11:52*1:67*6:45*15:55*27:53*43:41*311:50*278:47*22:8*1:40*6:37*6:34*278:33*184:21*139
+0*23:85*3:88*19:86*3:84*2:79*11:76*11:52*1:67*6:45*15:55*27:53*43:41*311:50*278:47*22:8*1:40*6:37*6:34*278:33*184:21*139
 0*1:86*1:42*1:21*1:10*1:11*1
 21*2:20*1
 0*3:41*2:50*4:42*2:34*4:33*1:21*2:10*2:11*2
 
-0*1:86*2
-0*4:85*2:4*1:36*5:42*742:40*15:38*16:21*1:10*742:11*742
+0*8:86*2
+0*6:85*2:4*1:36*5:42*742:40*15:38*16:21*1:10*742:11*742
 42*353:40*19:38*20:10*353:11*353
 
 0*1:41*4:50*6:47*2:34*6:33*2
@@ -114,27 +114,27 @@
 41*1:50*1:42*1:34*1:10*1:11*1
 0*1
 
-0*10:85*6:88*23:84*7:83*1:79*12:76*12:52*1:67*3:45*19:55*10:53*15:41*155:50*155:47*9:8*1:40*3:37*3:34*155:33*43:21*53:20*1
+0*15:85*6:88*23:84*7:83*1:79*12:76*12:52*1:67*3:45*19:55*10:53*15:41*155:50*155:47*9:8*1:40*3:37*3:34*155:33*43:21*53:20*1
 0*1
 0*1
 0*1:88*2:79*3:76*3:67*1:45*6:53*4:41*22:50*16:40*3:37*3:34*16:33*7:21*6
 0*2:88*9:79*1:76*1:67*3:45*17:55*2:53*2:41*59:50*49:47*4:40*5:37*5:34*49:33*20:21*18
 0*5:85*2:88*37:79*30:76*30:67*6:17*1:45*34:55*31:53*20:41*357:50*284:47*36:40*10:37*10:34*284:33*142:21*92
 0*4:88*50:79*21:76*21:67*2:45*22:55*7:53*11:41*129:50*172:47*12:40*13:37*13:34*172:33*17:21*5
-0*6:88*8:79*5:76*5:45*4:55*8:53*8:41*34:50*63:47*1:40*2:37*2:34*63:33*11:21*5:12*3
+0*7:88*8:79*5:76*5:45*4:55*8:53*8:41*34:50*63:47*1:40*2:37*2:34*63:33*11:21*5:12*3
 0*1:41*1
 0*1
 0*3:50*4:34*4
 0*1:88*1:55*1:53*1:41*1:8*1:42*1:10*1:11*1
 0*2
 85*1:36*1:67*1:41*14:50*1:42*1:34*1:10*1:11*1
-0*1:88*5:84*1:67*11:45*2:55*5:53*31:41*21:50*35:34*35:33*18:21*2
+0*2:88*5:84*1:67*11:45*2:55*5:53*31:41*21:50*35:34*35:33*18:21*2
 84*8
 85*13:84*4:50*1:34*1
 84*4
-85*2:88*8:84*4:79*29:76*29:45*29:55*21:53*10:41*113:50*130:47*6:42*8:40*2:38*1:37*1:34*130:33*31:21*66:10*8:11*8
+0*1:85*2:88*8:84*4:79*29:76*29:45*29:55*21:53*10:41*113:50*130:47*6:42*8:40*2:38*1:37*1:34*130:33*31:21*66:10*8:11*8
 42*10:40*1:38*1:10*10:11*10
-43*2:42*729:40*21:38*24:10*729:11*729
+0*1:43*2:42*729:40*21:38*24:10*729:11*729
 42*4:10*4:11*4
 42*17:40*1:38*1:10*17:11*17
 88*9:67*2:45*3:55*4:53*21:41*11:50*13:42*21:40*8:38*4:37*4:34*13:33*1:21*1:10*21:11*21
@@ -150,8 +150,8 @@
 0*1:42*1:10*1:11*1
 86*2:41*1:42*1:10*1:11*1
 12*1
-88*2:67*1:55*1:53*3:41*3:50*7:47*1:34*7:33*7:21*1
-88*8:79*5:76*5:67*7:45*15:55*8:53*6:41*62:50*55:47*3:40*4:37*4:34*55:33*37:21*11
+0*1:88*2:67*1:55*1:53*3:41*3:50*7:47*1:34*7:33*7:21*1
+0*1:88*8:79*5:76*5:67*7:45*15:55*8:53*6:41*62:50*55:47*3:40*4:37*4:34*55:33*37:21*11
 0*1:88*4:79*2:76*2:67*2:45*1:55*4:53*5:41*42:50*42:40*2:37*2:34*42:33*21:21*8
 50*1:34*1:21*7
 21*1
@@ -159,12 +159,12 @@
 21*6
 21*1
 21*1
-0*1:21*1
-21*1
+0*2:21*1
+0*2:21*1
 21*1
 33*1
 85*7:55*1:41*1:50*4:34*4:33*1
-0*1:87*1:45*1:53*1:50*1:34*1
+0*3:87*1:45*1:53*1:50*1:34*1
 50*1:34*1
 50*3:34*3
 50*2:34*2
@@ -190,10 +190,19 @@
 53*1
 0*1
 0*1
-0*1
+0*5
 0*1
 55*1
 67*1
 88*1
 88*4
 0*1
+0*1
+0*1
+0*9
+0*1
+0*1
+0*2
+0*1
+0*1
+0*1