diff --git a/source/engine/3d/model.c b/source/engine/3d/model.c
index 7a889fe..d84caeb 100644
--- a/source/engine/3d/model.c
+++ b/source/engine/3d/model.c
@@ -44,15 +44,6 @@ cgltf_attribute *get_attr_type(cgltf_primitive *p, cgltf_attribute_type t)
 
 unsigned short pack_short_tex(float c) { return c * USHRT_MAX; }
 
-uint32_t pack_int10_n2(float *norm)
-{
-  uint32_t ret = 0;
-  for (int i = 0; i < 3; i++) {
-    int n = (norm[i]+1.0)*511;
-    ret |= (n & 0x3ff) << (10*i);
-  }
-  return ret;
-}
 
 void mesh_add_material(primitive *prim, cgltf_material *mat)
 {
@@ -124,6 +115,16 @@ sg_buffer index_buffer(float *f, int verts)
   });
 }
 
+uint32_t pack_int10_n2(float *norm)
+{
+  uint32_t ret = 0;
+  for (int i = 0; i < 3; i++) {
+    int n = (norm[i]+1.0)*511;
+    ret |= (n & 0x3ff) << (10*i);
+  }
+  return ret;
+}
+
 sg_buffer normal_floats(float *f, int n)
 {
   uint32_t packed_norms[n/3];
@@ -540,6 +541,7 @@ int mat2type(int mat)
 {
   switch(mat) {
     case MAT_POS:
+    case MAT_NORM:
       return SG_VERTEXFORMAT_FLOAT3;
     case MAT_PPOS:
     case MAT_WH:
@@ -548,7 +550,6 @@ int mat2type(int mat)
     case MAT_UV:
     case MAT_TAN:
       return SG_VERTEXFORMAT_USHORT2N;
-    case MAT_NORM:
       return SG_VERTEXFORMAT_UINT10_N2;
     case MAT_BONE:
       return SG_VERTEXFORMAT_UBYTE4;
diff --git a/source/engine/HandmadeMath.c b/source/engine/HandmadeMath.c
index 25f9b19..9e87c3c 100644
--- a/source/engine/HandmadeMath.c
+++ b/source/engine/HandmadeMath.c
@@ -1747,7 +1747,8 @@ HMM_Mat4 HMM_M4TRS(HMM_Vec3 t, HMM_Quat q, HMM_Vec3 s)
   HMM_Mat4 T = HMM_Translate(t);
   HMM_Mat4 R = HMM_QToM4(q);
   HMM_Mat4 S = HMM_Scale(s);
-  return HMM_MulM4(T,S);
+  return HMM_MulM4(T, HMM_MulM4(R, S));
+  //return HMM_MulM4(T,S);
   HMM_Mat4 l;
   float *lm = (float*)&l;
   
diff --git a/source/engine/jsffi.c b/source/engine/jsffi.c
index 5f80374..5a24e22 100644
--- a/source/engine/jsffi.c
+++ b/source/engine/jsffi.c
@@ -671,22 +671,22 @@ JSC_CCALL(render_end_pass,
   
   switch(mainwin.mode) {
     case MODE_STRETCH:
-      sg_apply_viewportf(0,0,mainwin.size.x,mainwin.size.y,1);
+      sg_apply_viewportf(0,0,mainwin.size.x,mainwin.size.y,0);
       break;
     case MODE_WIDTH:
-      sg_apply_viewportf(0, mainwin.top, mainwin.size.x, mainwin.psize.y,1); // keep width
+      sg_apply_viewportf(0, mainwin.top, mainwin.size.x, mainwin.psize.y,0); // keep width
       break;
     case MODE_HEIGHT:
-      sg_apply_viewportf(mainwin.left,0,mainwin.psize.x, mainwin.size.y,1); // keep height
+      sg_apply_viewportf(mainwin.left,0,mainwin.psize.x, mainwin.size.y,0); // keep height
       break;
     case MODE_KEEP:
-      sg_apply_viewportf(0,0,mainwin.rendersize.x, mainwin.rendersize.y, 1); // no scaling
+      sg_apply_viewportf(0,0,mainwin.rendersize.x, mainwin.rendersize.y, 0); // no scaling
       break;
     case MODE_EXPAND:
       if (mainwin.aspect < mainwin.raspect)
-        sg_apply_viewportf(0, mainwin.top, mainwin.size.x, mainwin.psize.y,1); // keep width
+        sg_apply_viewportf(0, mainwin.top, mainwin.size.x, mainwin.psize.y,0); // keep width
       else
-        sg_apply_viewportf(mainwin.left,0,mainwin.psize.x, mainwin.size.y,1); // keep height
+        sg_apply_viewportf(mainwin.left,0,mainwin.psize.x, mainwin.size.y,0); // keep height
       break;
   }
   p.id = js2number(argv[0]);
@@ -702,6 +702,8 @@ JSC_CCALL(render_end_pass,
   sg_commit();
 )
 
+JSC_CCALL(render_commit, sg_commit())
+
 JSC_SCALL(render_text_size, ret = bb2js(text_bb(str, js2number(argv[1]), js2number(argv[2]), 1)))
 
 JSC_CCALL(render_set_camera,
@@ -715,10 +717,10 @@ JSC_CCALL(render_set_camera,
   transform *t = js2transform(js_getpropstr(cam, "transform"));
   globalview.v = transform2mat(*t);
   HMM_Vec2 size = mainwin.mode == MODE_FULL ? mainwin.size : mainwin.rendersize;
-  sg_apply_viewportf(viewport.x*size.x, viewport.y*size.y, viewport.z*size.x, viewport.w*size.y,1);
+  //sg_apply_viewportf(viewport.x*size.x, viewport.y*size.y, viewport.z*size.x, viewport.w*size.y,0);
   
   if (ortho)
-    globalview.p = HMM_Orthographic_RH_NO(
+    globalview.p = HMM_Orthographic_RH_ZO(
       -size.x/2,
       size.x/2,
       -size.y/2,
@@ -727,10 +729,9 @@ JSC_CCALL(render_set_camera,
       far
     );
   else
-    globalview.p = HMM_Perspective_RH_NO(fov, size.y/size.x, near, far);
+    globalview.p = HMM_Perspective_RH_NO(fov, size.x/size.x, near, far);
     
   globalview.vp = HMM_MulM4(globalview.p, globalview.v);
-  projection = globalview.vp;
 )
 
 sg_shader js2shader(JSValue v)
@@ -830,6 +831,7 @@ JSC_CCALL(render_pipeline,
   p.layout = js2layout(argv[0]);
   p.cull_mode = js2number(js_getpropstr(argv[0], "cull"));
   p.primitive_type = js2number(js_getpropstr(argv[0], "primitive"));
+  p.face_winding = SG_FACEWINDING_CCW;
   p.index_type = SG_INDEXTYPE_UINT16;
   if (js2boolean(js_getpropstr(argv[0], "blend")))
     p.colors[0].blend = blend_trans;
@@ -872,7 +874,15 @@ JSC_CCALL(render_setuniv4,
 )
 
 JSC_CCALL(render_setuniproj,
-  sg_apply_uniforms(js2number(argv[0]), js2number(argv[1]), SG_RANGE_REF(projection));
+  sg_apply_uniforms(js2number(argv[0]), js2number(argv[1]), SG_RANGE_REF(globalview.p));
+)
+
+JSC_CCALL(render_setuniview,
+  sg_apply_uniforms(js2number(argv[0]), js2number(argv[1]), SG_RANGE_REF(globalview.v));
+)
+
+JSC_CCALL(render_setunivp,
+  sg_apply_uniforms(js2number(argv[0]), js2number(argv[1]), SG_RANGE_REF(globalview.vp));
 )
 
 JSC_CCALL(render_setunim4,
@@ -923,10 +933,13 @@ static const JSCFunctionListEntry js_render_funcs[] = {
   MIST_FUNC_DEF(render, setuniv, 2),
   MIST_FUNC_DEF(render, spdraw, 1),
   MIST_FUNC_DEF(render, setuniproj, 2),
+  MIST_FUNC_DEF(render, setuniview, 2),
+  MIST_FUNC_DEF(render, setunivp, 2),
   MIST_FUNC_DEF(render, setunim4, 3),
   MIST_FUNC_DEF(render, setuniv2, 2),
   MIST_FUNC_DEF(render, setuniv4, 2),
-  MIST_FUNC_DEF(render, setpipeline, 1)
+  MIST_FUNC_DEF(render, setpipeline, 1),
+  MIST_FUNC_DEF(render, commit, 0),
 };
 
 JSC_CCALL(gui_flush, text_flush());
@@ -1952,7 +1965,7 @@ JSValue parmesh2js(par_shapes_mesh *m)
   
   if (m->normals) {
     sg_buffer *norm = malloc(sizeof(*norm));
-    *norm = normal_floats(m->normals, 3*m->npoints);
+    *norm = float_buffer(m->normals, 3*m->npoints);
     js_setpropstr(obj, "norm", sg_buffer2js(norm));
   }
   
diff --git a/source/engine/transform.c b/source/engine/transform.c
index 576fe5a..698c5d0 100644
--- a/source/engine/transform.c
+++ b/source/engine/transform.c
@@ -6,6 +6,7 @@ transform *make_transform()
 {
   transform *t = calloc(sizeof(transform),1);
   t->scale = (HMM_Vec3){1,1,1};
+  t->rotation = (HMM_Quat){0,0,0,1};
   return t;
 }
 
diff --git a/source/engine/yugine.c b/source/engine/yugine.c
index b3ec4ef..d7727ec 100644
--- a/source/engine/yugine.c
+++ b/source/engine/yugine.c
@@ -227,6 +227,10 @@ sapp_desc sokol_main(int argc, char **argv) {
   signal(SIGFPE, seghandle);
 #endif
 
+  HMM_Quat norot = HMM_QFromAxisAngle_RH((HMM_Vec3){0,1,0}, 0.1);
+  norot = HMM_M4ToQ_RH(HMM_LookAt_RH((HMM_Vec3){0,0,-100}, v3zero, vUP));
+  printf("rot is %g,%g,%g,%g\n", norot.x, norot.y, norot.z, norot.w);
+
   resources_init();
   stm_setup(); /* time */
   script_startup();