More work done on emscripten