Index: class.c
==================================================================
--- class.c
+++ class.c
@@ -2214,10 +2214,14 @@
     nxttok();
     if(Tokenf(TF_MACRO)) ParseError("Unexpected macro\n");
     if(tokent==TF_CLOSE) {
       ll_code[ptr++]=OP_RET;
       return ptr;
+    } else if(Tokenf(TF_INT)) {
+      if(!(tokenv&~0xFFL)) ll_code[ptr++]=tokenv;
+      else if(!(tokenv&~0xFFFFL)) ll_code[ptr++]=OP_INT16,ll_code[ptr++]=tokenv;
+      else ll_code[ptr++]=OP_INT32,ll_code[ptr++]=OP_INT32,ll_code[ptr++]=tokenv>>16,ll_code[ptr++]=tokenv;
     } else if(Tokenf(TF_NAME)) {
       switch(tokenv) {
         case OP_IF:
           if(flowdepth==64) ParseError("Too much flow control nesting\n");
           ll_code[ptr++]=OP_IF;
@@ -2284,11 +2288,11 @@
       case OP_LABEL:
         i=look_hash(hash,LOCAL_HASH_SIZE,0x100,0x13F,ll_ndata+0x100,"data columns")?:(ll_ndata++)+0x100;
         i-=0x100;
         if(datac[i].name) ParseError("Duplicate definition\n");
         datac[i].name=strdup(tokenstr);
-        if(datac[i].name) fatal("Allocation failed\n");
+        if(!datac[i].name) fatal("Allocation failed\n");
         datac[i].ptr=ptr;
         ptr=level_table_code(ptr,hash);
         break;
       case OP_STRING:
         if(last) ParseError("Extra columns after fill column\n");

Index: class.doc
==================================================================
--- class.doc
+++ class.doc
@@ -2589,20 +2589,22 @@
   the label name, preceded by a underscore, and some characters will be
   stripped out.
 
 (<string> <label> <width> <format> <color>)
   Defines a display column. The <label> is the name of the data column.
-  The <width> is a number 1 to 255 or it can be * for fill width. The
-  <format> is a string of one or two characters; see the below list of
-  possible formats. The <color> is the text colour, and is optional; it
-  can be a number from 1 to 255, or it can be a sequence of parenthesized
-  pairs of a number (-127 to +127) and colour, to mean use those colour if
-  the value of this column is in range. It uses the colour for all values
-  up to and including the specified number, so the numbers should be listed
-  in ascending order, in order to work. The <string> is the heading; it is
-  not allowed to include control characters, nor can it include graphic
-  characters with code number less than 32.
+  The <width> is a number 1 to 255 or it can be * for fill width; only
+  the last column is allowed to be fill width (although it is also OK if
+  no colums are fill width). The <format> is a string of exactly one or
+  two characters; see the below list of possible formats. The <color> is
+  the text colour, and is optional; it can be a number from 1 to 255, or
+  it can be a sequence of parenthesized pairs of a number (-127 to +127)
+  and colour, to mean use those colour if the value of this column is
+  in range. It uses the colour for all values up to and including the
+  specified number, so the numbers should be listed in ascending order,
+  in order to work. The <string> is the heading; it is not allowed to
+  include control characters, nor can it include graphic characters with
+  code number less than 32.
 
 (<local> <type> <code...>)
   Defines a aggregate calculation. The <local> is the name of the aggregate
   to be referred by other blocks. The <type> is the type of aggregate,
   which can be one of: + for the sum, min for the least value (unsigned),

Index: function.c
==================================================================
--- function.c
+++ function.c
@@ -1182,23 +1182,48 @@
   .xFilter=vt1_playfield_filter,
   .xNext=vt1_playfield_next,
 );
 
 static int vt1_levels_connect(sqlite3*db,void*aux,int argc,const char*const*argv,sqlite3_vtab**vt,char**err) {
+  sqlite3_str*str;
+  int c,i,j;
   if(levels_schema) goto declare;
-  //TODO: Add columns specific to a puzzle set.
-  levels_schema=sqlite3_mprintf("CREATE TEMPORARY TABLE `LEVELS`"
-   "(`ID` INTEGER PRIMARY KEY, `ORD` INT, `CODE` INT, `WIDTH` INT, `HEIGHT` INT, `TITLE` BLOB, `SOLVED` INT, `SOLVABLE` INT);");
+  str=sqlite3_str_new(db);
+  sqlite3_str_appendall(str,"CREATE TEMPORARY TABLE `LEVELS`"
+   "(`ID` INTEGER PRIMARY KEY, `ORD` INT, `CODE` INT, `WIDTH` INT, `HEIGHT` INT, `TITLE` BLOB, `SOLVED` INT, `SOLVABLE` INT");
+  for(i=0;i<ll_ndata;i++) {
+    sqlite3_str_append(str,",\"_",3);
+    for(j=0;c=ll_data[i].name[j];j++) if(c>32 && c<127 && c!='"' && c!='[' && c!=']' && c!=';' && c!='`') sqlite3_str_appendchar(str,1,c);
+    free(ll_data[i].name);
+    ll_data[i].name=0;
+    sqlite3_str_appendchar(str,1,'"');
+  }
+  sqlite3_str_appendall(str,");");
+  levels_schema=sqlite3_str_finish(str);
   if(!levels_schema) fatal("Allocation failed\n");
   declare:
-  sqlite3_declare_vtab(db,levels_schema);
+  if(i=sqlite3_declare_vtab(db,levels_schema)) return i;
   *vt=sqlite3_malloc(sizeof(sqlite3_vtab));
   return *vt?SQLITE_OK:SQLITE_NOMEM;
 }
+
+typedef struct {
+  Value misc1,misc2,misc3;
+  Uint8 x,y,dir,bizarro;
+  Uint16 class;
+} ObjInfo;
+
+static void calculate_level_column(sqlite3_stmt*st,const unsigned char*lvl,long sz) {
+  ObjInfo ob;
+  ObjInfo mru[2];
+  mru[0].class=mru[1].class=0;
+  ob.x=ob.y=ob.bizarro=0;
+  
+}
 
 static int vt1_levels_open(sqlite3_vtab*vt,sqlite3_vtab_cursor**cur) {
-  //TODO: Add columns specific to a puzzle set.
+  sqlite3_str*str;
   sqlite3_stmt*st1;
   sqlite3_stmt*st2;
   const unsigned char*d;
   unsigned char*p;
   int i,j;
@@ -1212,12 +1237,19 @@
   }
   if(sqlite3_prepare_v2(userdb,"SELECT `LEVEL`, IFNULL(`DATA`,READ_LUMP_AT(`OFFSET`,?1)), `USERSTATE` FROM `USERCACHEDATA`"
    " WHERE `FILE` = LEVEL_CACHEID() AND `LEVEL` NOT NULL AND `LEVEL` >= 0 ORDER BY `LEVEL`;",-1,&st1,0))
    goto err;
   // ?1=ID, ?2=CODE, ?3=WIDTH, ?4=HEIGHT, ?5=TITLE, ?6=SOLVED, ?7=SOLVABLE
-  if(sqlite3_prepare_v3(userdb,"INSERT INTO `LEVELS` VALUES(?1,NULL,?2,?3,?4,?5,?6,?7);",-1,SQLITE_PREPARE_NO_VTAB,&st2,0))
+  str=sqlite3_str_new(userdb);
+  sqlite3_str_appendall(str,"INSERT INTO `LEVELS` VALUES(?1,NULL,?2,?3,?4,?5,?6,?7");
+  for(i=0;i<ll_ndata;i++) sqlite3_str_appendf(str,",?%d",i+8);
+  sqlite3_str_appendall(str,");");
+  p=sqlite3_str_finish(str);
+  if(!p) fatal("Allocation failed\n");
+  if(sqlite3_prepare_v3(userdb,p,-1,SQLITE_PREPARE_NO_VTAB,&st2,0))
    goto err;
+  sqlite3_free(p);
   sqlite3_bind_pointer(st1,1,levelfp,"http://zzo38computer.org/fossil/heromesh.ui#FILE_ptr",0);
   while((i=sqlite3_step(st1))==SQLITE_ROW) {
     sqlite3_reset(st2);
     sqlite3_bind_int(st2,1,sqlite3_column_int(st1,0));
     d=sqlite3_column_blob(st1,1); n=sqlite3_column_bytes(st1,1);
@@ -1226,10 +1258,11 @@
     sqlite3_bind_int(st2,3,(d[4]&63)+1);
     sqlite3_bind_int(st2,4,(d[5]&63)+1);
     for(i=6;i<n && d[i];i++);
     j=d[0]|(d[1]<<8);
     sqlite3_bind_blob(st2,5,d+6,i-6,0);
+    calculate_level_column(st2,d,n);
     p=read_lump(FIL_SOLUTION,sqlite3_column_int(st1,0),&n);
     if(p) {
       sqlite3_bind_int(st2,7,(n>2 && d[0]==p[0] && d[1]==p[1]));
       free(p);
     } else {
@@ -1238,10 +1271,11 @@
     d=sqlite3_column_blob(st1,2); n=sqlite3_column_bytes(st1,2);
     sqlite3_bind_int(st2,6,(d && n>5 && n-(d[n-2]<<8)-d[n-1]>3 && (d[n-4]<<8)+d[n-3]==j));
     while((i=sqlite3_step(st2))==SQLITE_ROW);
     if(i!=SQLITE_DONE) goto err;
     sqlite3_bind_null(st2,5);
+    for(i=0;i<ll_ndata;i++) sqlite3_bind_null(st2,i+8);
   }
   if(i!=SQLITE_DONE) goto err;
   sqlite3_finalize(st1);
   sqlite3_finalize(st2);
   if(sqlite3_prepare_v3(userdb,"UPDATE `LEVELS` SET `ORD` = ?1 WHERE `ID` = ?2;",-1,SQLITE_PREPARE_NO_VTAB,&st2,0))

Index: game.c
==================================================================
--- game.c
+++ game.c
@@ -743,10 +743,11 @@
     if(i<1) i=j;
     if(i>j) i=j;
     if(i>255) i=255;
     columns=i;
   }
+  if(!ll_head) ll_head="\xB3W \xB3H \xB3 TITLE";
   // ID, ORD, CODE, WIDTH, HEIGHT, TITLE, SOLVED, SOLVABLE, ...
   if(sqlite3_prepare_v2(userdb,"SELECT * FROM `LEVELS` WHERE `ORD` NOT NULL AND `ORD` >= ?1 ORDER BY `ORD`;",-1,&st,0)) {
     screen_message(sqlite3_errmsg(userdb));
     return 0;
   }
@@ -763,12 +764,12 @@
   draw_text(0,0,"<LMB/\x18\x19\x1A\x1B> Select  <MMB/SP> Title  <RMB/RET> Play  <0-9> Find  <ESC> Cancel",0xF7,0xF0);
   draw_text(0,8,"<F1> Wide/Tall  <F2> ID/Ord",0xF7,0xF0);
   sqlite3_reset(st);
   if(mo&1) {
     scrmax=level_nindex;
-    draw_text(16,16,"\xB3 ORD \xB3W \xB3H \xB3 TITLE",0xF7,0xF1);
-    if(mo&2) draw_text(24,16," ID ",0xF7,0xF1);
+    draw_text(16+060,16,ll_head,0xF7,0xF1);
+    draw_text(16,16,mo&2?"\xB3 ID  ":"\xB3 ORD ",0xF7,0xF1);
     if(rescroll) {
       if(sel<scroll) scroll=sel;
       if(sel>=scroll+screen->h/8-3) scroll=sel+4-screen->h/8;
       rescroll=0;
     }

Index: main.c
==================================================================
--- main.c
+++ main.c
@@ -1069,11 +1069,10 @@
   if(main_options['c']) {
     load_classes();
     return 0;
   }
   init_sql();
-  load_key_bindings();
   init_screen();
   if(main_options['p']) {
     run_picture_editor();
     return 0;
   }
@@ -1085,10 +1084,11 @@
     return 0;
   }
   if(!main_options['z']) init_usercache();
   if(main_options['n']) return 0;
   load_classes();
+  load_key_bindings();
   load_level_index();
   optionquery[1]=Q_maxObjects;
   max_objects=strtoll(xrm_get_resource(resourcedb,optionquery,optionquery,2)?:"",0,0)?:0xFFFF0000L;
   set_tracing();
   annihilate();