diff --git a/assets/keylayout/ko_kr_3set_390.ime b/assets/keylayout/ko_kr_3set_390.ime
index a25007987..63a487d84 100644
--- a/assets/keylayout/ko_kr_3set_390.ime
+++ b/assets/keylayout/ko_kr_3set_390.ime
@@ -265,6 +265,7 @@ let isHangul = (s) => s !== undefined && inRange(s.charCodeAt(0), 0x1100, 0x11C2
 let isChoseong = (s) =>  s !== undefined && inRange(s.charCodeAt(0), 0x1100, 0x1112)
 let isJungseong = (s) => s !== undefined && inRange(s.charCodeAt(0), 0x1161, 0x1175)
 let isJongseong = (s) => s !== undefined && inRange(s.charCodeAt(0), 0x11A8, 0x11C2)
+let isJungseongSuper = (s) => s !== undefined && inRange(s.charCodeAt(0), 0x119E, 0x11A2)
 let isChoseongDigraph = (s) => s !== undefined && ([0x1100, 0x1103, 0x1107, 0x1109, 0x110C].includes(s.charCodeAt(0)))
 let isThisCharChoseongDigraph = (s) => s !== undefined && ([0x1101, 0x1104, 0x1108, 0x110A, 0x110D].includes(s.charCodeAt(0)))
 let isThisCharJungseongDigraph = (s) => s !== undefined && ([0x116A, 0x116B, 0x116C, 0x116F, 0x1170, 0x1171, 0x1174].includes(s.charCodeAt(0)))
@@ -336,55 +337,46 @@ let normaliseLUT = {
 "\u11C1":"\u314D","\u11C2":"\u314E"
 }
 let normaliseBuf = (it) => normaliseLUT[it] || it
-let bufAssemble = (isPreview) => {
+let bufAssemble = (normalise) => {
     // nothing on the buffer
     if (states.buf[0] === undefined && states.buf[1] === undefined && states.buf[2] === undefined)
         return ''
     // Hangul: I x F
-    else if (isPreview && states.buf[1] === undefined && isHangul(states.buf[0]))
+    else if (!normalise && states.buf[1] === undefined && isHangul(states.buf[0]))
         return [states.buf[0], "\u1160", states.buf[2]].join('')
     // Hangul: x P F
-    else if (isPreview && states.buf[0] === undefined && isHangul(states.buf[1]))
+    else if (!normalise && states.buf[0] === undefined && isHangul(states.buf[1]))
         return ["\u115F", states.buf[1], states.buf[2]].join('')
     // Hangul: x x F
-    else if (isPreview && isHangul(states.buf[2]) && states.buf[0] === undefined && states.buf[1] === undefined )
+    else if (!normalise && isHangul(states.buf[2]) && states.buf[0] === undefined && states.buf[1] === undefined )
         return ["\u115F", "\u1160", states.buf[2]].join('')
-    // Hangul: I P F
-    else if (isChoseong(states.buf[0]) && isJungseong(states.buf[1]) && isJongseong(states.buf[2])) {
+    // Hangul: I P F → Hangul Syllables (\uAC00..\uD7A3)
+    else if (!isJungseongSuper(states.buf[1]) && isChoseong(states.buf[0]) && isJungseong(states.buf[1]) && isJongseong(states.buf[2])) {
         let i = states.buf[0].charCodeAt(0) - 0x1100
         let p = states.buf[1].charCodeAt(0) - 0x1161
         let f = states.buf[2].charCodeAt(0) - 0x11A7
         return String.fromCodePoint(0xAC00 + (i * 588) + (p * 28) + f)
     }
-    // Hangul: I P
-    else if (isChoseong(states.buf[0]) && isJungseong(states.buf[1]) && undefined == states.buf[2]) {
+    // Hangul: I P → Hangul Syllables (\uAC00..\uD7A3)
+    else if (!isJungseongSuper(states.buf[1]) && isChoseong(states.buf[0]) && isJungseong(states.buf[1]) && undefined == states.buf[2]) {
         let i = states.buf[0].charCodeAt(0) - 0x1100
         let p = states.buf[1].charCodeAt(0) - 0x1161
         return String.fromCodePoint(0xAC00 + (i * 588) + (p * 28))
     }
     // Normalise unterminated hangul assembly
-    else if (!isPreview)
+    else if (normalise && !isJungseongSuper(states.buf[1]))
         return states.buf.map(it => normaliseBuf(it)).join('')
     else
         return states.buf.join('')
 }
 let bufDebugStringify = (buf) => [0,1,2].map(i => (buf[i] == undefined) ? "·" : `\\u${buf[i].codePointAt(0).toString(16).toUpperCase()}`).join(' ')
-return Object.freeze({"n":"세벌식 3-90","v":"one","c":"CuriousTo\uA75Bvald","m":"candidates",
+return Object.freeze({"n":"세벌식 3-90","v":"one","c":"CuriousTo\uA75Bvald","m":"rewrite",
 "t":states.keylayouts.map(it => [it[0],it[1]]),
 // return: [displayed output, composed output]
 "accept":(headkey,shiftin,altgrin)=>{
     let layer = 1*shiftin// + 2*altgrin
     states.code = 1
 
-    /*let purekeys = keycodes.filter(it => (
-            inRange(it,7,18) || // numeric
-            inRange(it,29,56) || // alph
-            it == 62 || // space
-            inRange(it,66,76) || // symbols
-            inRange(it,144,163) // numpad
-    ))
-    let headkey = purekeys[0]*/
-
     let s = states.keylayouts[headkey][layer]
     let bufIndex = isJungseong(s) ? 1 : isJongseong(s) ? 2 : 0
 
@@ -423,25 +415,38 @@ return Object.freeze({"n":"세벌식 3-90","v":"one","c":"CuriousTo\uA75Bvald","
         }
         // key inputs that bufIndex collides (end compose and accept incoming char as a new char state)
         else if (states.buf[bufIndex] !== undefined) {
-//            let oldbufstr = bufDebugStringify(states.buf)
-            let sendout = bufAssemble(); reset()
+            let oldstr = bufAssemble(1)
+            reset()
             states.buf[bufIndex] = s
-//            let newbufstr = bufDebugStringify(states.buf)
-//            console.log(`sending out: ${oldbufstr} -> ${sendout} ; ${newbufstr}`)
-            return [bufAssemble(1), sendout]
+//            console.log(`sending bufout: 1,${oldstr} ${bufDebugStringify(states.buf)}`)
+            return ["1", oldstr + bufAssemble()]
         }
         else {
+            let bufferEmpty = (!states.buf[0] && !states.buf[1] && !states.buf[2])
             states.buf[bufIndex] = s
-//            console.log(`assembling: ${bufDebugStringify(states.buf)} -> ${bufAssemble()}`)
+
+            if (bufferEmpty) {
+//                console.log(`assem0: ${bufDebugStringify(states.buf)} -> 0,${bufAssemble()}`)
+                return ["0", bufAssemble()]
+            }
+            else {
+//                console.log(`assem1: ${bufDebugStringify(states.buf)} -> 1,${bufAssemble()}`)
+                return ["1", bufAssemble()]
+            }
         }
 
-        return [bufAssemble(1), ""]
+//        console.log(`assem-digraph: ${bufDebugStringify(states.buf)} -> 1,${bufAssemble()}`)
+        return ["1", bufAssemble()]
+    }
+    else if (states.buf[0]) {
+        let oldstr = bufAssemble(1)
+        reset()
+//        console.log(`sending1 out: 1,${oldstr}${s}`)
+        return ["1", oldstr + s]
     }
     else {
-//        let oldbufstr = bufDebugStringify(states.buf)
-        let sendout = bufAssemble() + (s || ''); reset()
-//        console.log(`sending out: ${oldbufstr} -> ${sendout}`)
-        return [bufAssemble(1), sendout]
+//        console.log(`sending0 out: 0,${s}`)
+        return ["0", s]
     }
 },
 "backspace":()=>{
@@ -466,7 +471,7 @@ return Object.freeze({"n":"세벌식 3-90","v":"one","c":"CuriousTo\uA75Bvald","
 //    let newbufstr = bufDebugStringify(states.buf)
 //    console.log(`popping assembly: ${oldbufstr} -> ${newbufstr}`)
 
-    return bufAssemble(1)
+    return bufAssemble()
 },
 "end":()=>{
 //    console.log(`end composing`)
diff --git a/assets/keylayout/ko_kr_3set_390.notanime b/assets/keylayout/ko_kr_3set_390.notanime
new file mode 100644
index 000000000..a25007987
--- /dev/null
+++ b/assets/keylayout/ko_kr_3set_390.notanime
@@ -0,0 +1,479 @@
+let states = {"keylayouts":[[""],[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+["\u110F",")"],
+["\u11C2","\u11BD"],
+["\u11BB","@"],
+["\u11B8","#"],
+["\u116D","$"],
+["\u1172","%"],
+["\u1163","^"],
+["\u1168","&"],
+["\u1174","*"],
+["\u116E","("],
+["*"],
+["#"],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+["\u11BC","\u11AE"],
+["\u116E","!"],
+["\u1166","\u11B1"],
+["\u1175","\u11B0"],
+["\u1167","\u11BF"],
+["\u1161","\u11A9"],
+["\u1173","/"],
+["\u1102","'"],
+["\u1106","8"],
+["\u110B","4"],
+["\u1100","5"],
+["\u110C","6"],
+["\u1112","1"],
+["\u1109","0"],
+["\u110E","9"],
+["\u1111",">"],
+["\u11BA","\u11C1"],
+["\u1162","\u1164"],
+["\u11AB","\u11AD"],
+["\u1165",";"],
+["\u1103","7"],
+["\u1169","\u11B6"],
+["\u11AF","\u11C0"],
+["\u11A8","\u11B9"],
+["\u1105","<"],
+["\u11B7","\u11BE"],
+[",","2"],
+[".","3"],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[" "],
+[undefined],
+[undefined],
+[undefined],
+["\n"],
+["\x08"],
+["¤","~"],
+["-","_"],
+["=","+"],
+["[","{"],
+["]","}"],
+["\\","₩"],
+["\u1107",":"],
+["\u1110",'"'],
+["\u1169","?"],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+["0"],
+["1"],
+["2"],
+["3"],
+["4"],
+["5"],
+["6"],
+["7"],
+["8"],
+["9"],
+["/"],
+["*"],
+["-"],
+["+"],
+["."],
+["."],
+["\n"],
+["="],
+["("],
+[")"],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined],
+[undefined]
+],
+"code":0,
+"buf":[]}
+let reset = () => {
+    states.code = 0
+    states.buf = []
+}
+let inRange = (s,a,b) => (a <= s && s <= b)
+let isHangul = (s) => s !== undefined && inRange(s.charCodeAt(0), 0x1100, 0x11C2)
+let isChoseong = (s) =>  s !== undefined && inRange(s.charCodeAt(0), 0x1100, 0x1112)
+let isJungseong = (s) => s !== undefined && inRange(s.charCodeAt(0), 0x1161, 0x1175)
+let isJongseong = (s) => s !== undefined && inRange(s.charCodeAt(0), 0x11A8, 0x11C2)
+let isChoseongDigraph = (s) => s !== undefined && ([0x1100, 0x1103, 0x1107, 0x1109, 0x110C].includes(s.charCodeAt(0)))
+let isThisCharChoseongDigraph = (s) => s !== undefined && ([0x1101, 0x1104, 0x1108, 0x110A, 0x110D].includes(s.charCodeAt(0)))
+let isThisCharJungseongDigraph = (s) => s !== undefined && ([0x116A, 0x116B, 0x116C, 0x116F, 0x1170, 0x1171, 0x1174].includes(s.charCodeAt(0)))
+let isThisCharJongseongDigraph = (s) => s !== undefined && ([0x11A9, 0x11AA, 0x11AC, 0x11AD, 0x11B0, 0x11B1, 0x11B2, 0x11B3, 0x11B4, 0x11B5, 0x11B6, 0x11B9].includes(s.charCodeAt(0))) // ㅆ is an exception!
+let isJungseongDigraphO = (s) => s !== undefined && ([0x1161, 0x1162, 0x1175].includes(s.charCodeAt(0)))
+let isJungseongDigraphU = (s) => s !== undefined && ([0x1165, 0x1166, 0x1175].includes(s.charCodeAt(0)))
+let isJungseongDigraphEU = (s) => s !== undefined && ([0x1175].includes(s.charCodeAt(0)))
+let isJongseongDigraphG = (s) => s !== undefined && ([0x11A8, 0x11BA].includes(s.charCodeAt(0)))
+let isJongseongDigraphN = (s) => s !== undefined && ([0x11BD, 0x11C2].includes(s.charCodeAt(0)))
+let isJongseongDigraphR = (s) => s !== undefined && ([0x11A8, 0x11B7, 0x11B8, 0x11BA, 0x11C0, 0x11C1, 0x11C2].includes(s.charCodeAt(0)))
+let isJongseongDigraphB = (s) => s !== undefined && ([0x11BA].includes(s.charCodeAt(0)))
+let choseongDigraphs = {"\u1100":"\u1101", "\u1103":"\u1104", "\u1107":"\u1108", "\u1109":"\u110A", "\u110C":"\u110D"}
+let jungseongDigraphsO = {"\u1161":"\u116A", "\u1162":"\u116B", "\u1175":"\u116C"}
+let jungseongDigraphsU = {"\u1165":"\u116F", "\u1166":"\u1170", "\u1175":"\u1171"}
+let jungseongDigraphsEU = {"\u1175":"\u1174"}
+let jongseongDigraphsG = {"\u11A8":"\u11A9", "\u11BA":"\u11AA"}
+let jongseongDigraphsN = {"\u11BD":"\u11AC", "\u11C2":"\u11AD"}
+let jongseongDigraphsR = {"\u11A8":"\u11B0", "\u11B7":"\u11B1", "\u11B8":"\u11B2", "\u11BA":"\u11B3", "\u11C0":"\u11B4", "\u11C1":"\u11B5", "\u11C2":"\u11B6"}
+let jongseongDigraphsB = {"\u11BA":"\u11B9"}
+let detachChoseongDigraph = {
+"\u1101":["\u1100","\u1100"],
+"\u1104":["\u1103","\u1103"],
+"\u1108":["\u1107","\u1107"],
+"\u110A":["\u1109","\u1109"],
+"\u110D":["\u110C","\u110C"]
+}
+let detachJungseongDigraph = {
+"\u116A":["\u1169","\u1161"],
+"\u116B":["\u1169","\u1162"],
+"\u116C":["\u1169","\u1175"],
+"\u116F":["\u116E","\u1165"],
+"\u1170":["\u116E","\u1166"],
+"\u1171":["\u116E","\u1175"],
+"\u1174":["\u1173","\u1175"]
+}
+let detachJongseongDigraph = {
+"\u11A9":["\u11A8","\u11A8"],
+"\u11AA":["\u11A8","\u11BA"],
+"\u11AC":["\u11AB","\u11BD"],
+"\u11AD":["\u11AB","\u11C2"],
+"\u11B0":["\u11AF","\u11A8"],
+"\u11B1":["\u11AF","\u11B7"],
+"\u11B2":["\u11AF","\u11B8"],
+"\u11B3":["\u11AF","\u11BA"],
+"\u11B4":["\u11AF","\u11C0"],
+"\u11B5":["\u11AF","\u11C1"],
+"\u11B6":["\u11AF","\u11C2"],
+"\u11B9":["\u11B8","\u11BA"],
+"\u11BB":["\u11BA","\u11BA"]
+}
+let normaliseLUT = {
+// Hangul Jamo Initials → Hangul Compatibility Jamo
+"\u1100":"\u3131","\u1101":"\u3132","\u1102":"\u3134","\u1103":"\u3137","\u1104":"\u3138",
+"\u1105":"\u3139","\u1106":"\u3141","\u1107":"\u3142","\u1108":"\u3143","\u1109":"\u3145",
+"\u110A":"\u3146","\u110B":"\u3147","\u110C":"\u3148","\u110D":"\u3149","\u110E":"\u314A",
+"\u110F":"\u314B","\u1110":"\u314C","\u1111":"\u314D","\u1112":"\u314E",
+// Hangul Jamo Peaks → Hangul Compatibility Jamo
+"\u1161":"\u314F","\u1162":"\u3150","\u1163":"\u3151","\u1164":"\u3152","\u1165":"\u3153",
+"\u1166":"\u3154","\u1167":"\u3155","\u1168":"\u3156","\u1169":"\u3157","\u116A":"\u3158",
+"\u116B":"\u3159","\u116C":"\u315A","\u116D":"\u315B","\u116E":"\u315C","\u116F":"\u315D",
+"\u1170":"\u315E","\u1171":"\u315F","\u1172":"\u3160","\u1173":"\u3161","\u1174":"\u3162",
+"\u1175":"\u3163",
+// Hangul Jamo Finals → Hangul Compatibility Jamo
+"\u11A8":"\u3131","\u11A9":"\u3132","\u11AA":"\u3133","\u11AB":"\u3134","\u11AC":"\u3135",
+"\u11AD":"\u3136","\u11AE":"\u3137","\u11AF":"\u3139","\u11B0":"\u313A","\u11B1":"\u313B",
+"\u11B2":"\u313C","\u11B3":"\u313D","\u11B4":"\u313E","\u11B5":"\u313F","\u11B6":"\u3140",
+"\u11B7":"\u3141","\u11B8":"\u3142","\u11B9":"\u3144","\u11BA":"\u3145","\u11BB":"\u3146",
+"\u11BC":"\u3147","\u11BD":"\u3148","\u11BE":"\u314A","\u11BF":"\u314B","\u11C0":"\u314C",
+"\u11C1":"\u314D","\u11C2":"\u314E"
+}
+let normaliseBuf = (it) => normaliseLUT[it] || it
+let bufAssemble = (isPreview) => {
+    // nothing on the buffer
+    if (states.buf[0] === undefined && states.buf[1] === undefined && states.buf[2] === undefined)
+        return ''
+    // Hangul: I x F
+    else if (isPreview && states.buf[1] === undefined && isHangul(states.buf[0]))
+        return [states.buf[0], "\u1160", states.buf[2]].join('')
+    // Hangul: x P F
+    else if (isPreview && states.buf[0] === undefined && isHangul(states.buf[1]))
+        return ["\u115F", states.buf[1], states.buf[2]].join('')
+    // Hangul: x x F
+    else if (isPreview && isHangul(states.buf[2]) && states.buf[0] === undefined && states.buf[1] === undefined )
+        return ["\u115F", "\u1160", states.buf[2]].join('')
+    // Hangul: I P F
+    else if (isChoseong(states.buf[0]) && isJungseong(states.buf[1]) && isJongseong(states.buf[2])) {
+        let i = states.buf[0].charCodeAt(0) - 0x1100
+        let p = states.buf[1].charCodeAt(0) - 0x1161
+        let f = states.buf[2].charCodeAt(0) - 0x11A7
+        return String.fromCodePoint(0xAC00 + (i * 588) + (p * 28) + f)
+    }
+    // Hangul: I P
+    else if (isChoseong(states.buf[0]) && isJungseong(states.buf[1]) && undefined == states.buf[2]) {
+        let i = states.buf[0].charCodeAt(0) - 0x1100
+        let p = states.buf[1].charCodeAt(0) - 0x1161
+        return String.fromCodePoint(0xAC00 + (i * 588) + (p * 28))
+    }
+    // Normalise unterminated hangul assembly
+    else if (!isPreview)
+        return states.buf.map(it => normaliseBuf(it)).join('')
+    else
+        return states.buf.join('')
+}
+let bufDebugStringify = (buf) => [0,1,2].map(i => (buf[i] == undefined) ? "·" : `\\u${buf[i].codePointAt(0).toString(16).toUpperCase()}`).join(' ')
+return Object.freeze({"n":"세벌식 3-90","v":"one","c":"CuriousTo\uA75Bvald","m":"candidates",
+"t":states.keylayouts.map(it => [it[0],it[1]]),
+// return: [displayed output, composed output]
+"accept":(headkey,shiftin,altgrin)=>{
+    let layer = 1*shiftin// + 2*altgrin
+    states.code = 1
+
+    /*let purekeys = keycodes.filter(it => (
+            inRange(it,7,18) || // numeric
+            inRange(it,29,56) || // alph
+            it == 62 || // space
+            inRange(it,66,76) || // symbols
+            inRange(it,144,163) // numpad
+    ))
+    let headkey = purekeys[0]*/
+
+    let s = states.keylayouts[headkey][layer]
+    let bufIndex = isJungseong(s) ? 1 : isJongseong(s) ? 2 : 0
+
+    if (isHangul(s)) {
+        // ㄲ ㄸ ㅃ ㅆ ㅉ (only allow when the jung/jongseong is not typed)
+        if (0 == bufIndex && undefined == states.buf[1] && isChoseongDigraph(states.buf[0]) && states.buf[0] == s) {
+            states.buf[0] = choseongDigraphs[s]
+        }
+        // ㅘ ㅙ ㅚ
+        else if (1 == bufIndex && "\u1169" == states.buf[1] && isJungseongDigraphO(s)) {
+            states.buf[1] = jungseongDigraphsO[s]
+        }
+        // ㅝ ㅞ ㅟ
+        else if (1 == bufIndex && "\u116E" == states.buf[1] && isJungseongDigraphU(s)) {
+            states.buf[1] = jungseongDigraphsU[s]
+        }
+        // ㅢ
+        else if (1 == bufIndex && "\u1173" == states.buf[1] && isJungseongDigraphEU(s)) {
+            states.buf[1] = jungseongDigraphsEU[s]
+        }
+        // ㄲ ㄳ
+        else if (2 == bufIndex && "\u11A8" == states.buf[2] && isJongseongDigraphG(s)) {
+            states.buf[2] = jongseongDigraphsG[s]
+        }
+        // ㄵ ㄶ
+        else if (2 == bufIndex && "\u11AB" == states.buf[2] && isJongseongDigraphN(s)) {
+            states.buf[2] = jongseongDigraphsN[s]
+        }
+        // ㄺ ㄻ ㄼ ㄽ ㄾ ㄿ ㅀ
+        else if (2 == bufIndex && "\u11AF" == states.buf[2] && isJongseongDigraphR(s)) {
+            states.buf[2] = jongseongDigraphsR[s]
+        }
+        // ㅄ
+        else if (2 == bufIndex && "\u11B8" == states.buf[2] && isJongseongDigraphB(s)) {
+            states.buf[2] = jongseongDigraphsB[s]
+        }
+        // key inputs that bufIndex collides (end compose and accept incoming char as a new char state)
+        else if (states.buf[bufIndex] !== undefined) {
+//            let oldbufstr = bufDebugStringify(states.buf)
+            let sendout = bufAssemble(); reset()
+            states.buf[bufIndex] = s
+//            let newbufstr = bufDebugStringify(states.buf)
+//            console.log(`sending out: ${oldbufstr} -> ${sendout} ; ${newbufstr}`)
+            return [bufAssemble(1), sendout]
+        }
+        else {
+            states.buf[bufIndex] = s
+//            console.log(`assembling: ${bufDebugStringify(states.buf)} -> ${bufAssemble()}`)
+        }
+
+        return [bufAssemble(1), ""]
+    }
+    else {
+//        let oldbufstr = bufDebugStringify(states.buf)
+        let sendout = bufAssemble() + (s || ''); reset()
+//        console.log(`sending out: ${oldbufstr} -> ${sendout}`)
+        return [bufAssemble(1), sendout]
+    }
+},
+"backspace":()=>{
+    // disassemble jung/jongseong digraphs
+//    let oldbufstr = bufDebugStringify(states.buf)
+    let last = states.buf.pop()
+
+    if (last !== undefined) {
+        // detach jongseong
+        if (isThisCharJongseongDigraph(last))
+            states.buf[2] = detachJongseongDigraph[last][0]
+        // detach jungseong
+        else if (isThisCharJungseongDigraph(last))
+            states.buf[1] = detachJungseongDigraph[last][0]
+        // detach choseong
+        else if (isThisCharChoseongDigraph(last))
+            states.buf[0] = detachChoseongDigraph[last][0]
+    }
+
+    if (states.buf.length == 0) reset()
+
+//    let newbufstr = bufDebugStringify(states.buf)
+//    console.log(`popping assembly: ${oldbufstr} -> ${newbufstr}`)
+
+    return bufAssemble(1)
+},
+"end":()=>{
+//    console.log(`end composing`)
+    let ret = bufAssemble()
+    reset()
+    return ret
+},
+"reset":()=>{ reset() },
+"composing":()=>(states.code!=0)
+})
\ No newline at end of file
diff --git a/assets/keylayout/ko_kr_3set_shin_p2.ime b/assets/keylayout/ko_kr_3set_shin_p2.ime
index a93c8edb6..b3c836427 100644
--- a/assets/keylayout/ko_kr_3set_shin_p2.ime
+++ b/assets/keylayout/ko_kr_3set_shin_p2.ime
@@ -347,18 +347,18 @@ let normaliseLUT = {
 "\u11C1":"\u314D","\u11C2":"\u314E"
 }
 let normaliseBuf = (it) => normaliseLUT[it] || it
-let bufAssemble = () => {
+let bufAssemble = (normalise) => {
     // nothing on the buffer
     if (states.buf[0] === undefined && states.buf[1] === undefined && states.buf[2] === undefined)
         return ''
     // Hangul: I x F
-    else if (states.buf[1] === undefined && isHangul(states.buf[0]))
+    else if (!normalise && states.buf[1] === undefined && isHangul(states.buf[0]))
         return [states.buf[0], "\u1160", states.buf[2]].join('')
     // Hangul: x P F
-    else if (states.buf[0] === undefined && isHangul(states.buf[1]))
+    else if (!normalise && states.buf[0] === undefined && isHangul(states.buf[1]))
         return ["\u115F", states.buf[1], states.buf[2]].join('')
     // Hangul: x x F
-    else if (isHangul(states.buf[2]) && states.buf[0] === undefined && states.buf[1] === undefined )
+    else if (!normalise && isHangul(states.buf[2]) && states.buf[0] === undefined && states.buf[1] === undefined )
         return ["\u115F", "\u1160", states.buf[2]].join('')
     // Hangul: I P F → Hangul Syllables (\uAC00..\uD7A3)
     else if (!isJungseongSuper(states.buf[1]) && isChoseong(states.buf[0]) && isJungseong(states.buf[1]) && isJongseong(states.buf[2])) {
@@ -373,9 +373,14 @@ let bufAssemble = () => {
         let p = states.buf[1].charCodeAt(0) - 0x1161
         return String.fromCodePoint(0xAC00 + (i * 588) + (p * 28))
     }
+    // Normalise unterminated hangul assembly
+    else if (normalise && !isJungseongSuper(states.buf[1]))
+        return states.buf.map(it => normaliseBuf(it)).join('')
     else
         return states.buf.join('')
 }
+let isBufferEmpty = (buf) => buf[0] === undefined && buf[1] === undefined && buf[2] === undefined
+let isBufferNotEmpty = (buf) => buf[0] !== undefined || buf[1] !== undefined || buf[2] !== undefined
 let bufDebugStringify = (buf) => [0,1,2].map(i => (buf[i] == undefined) ? "·" : `\\u${buf[i].codePointAt(0).toString(16).toUpperCase()}`).join(' ')
 return Object.freeze({"n":"신세벌식 P2","v":"one","c":"CuriousTo\uA75Bvald","m":"rewrite",
 "t":states.keylayouts.map(it => [it[0],it[1]]),
@@ -451,14 +456,14 @@ return Object.freeze({"n":"신세벌식 P2","v":"one","c":"CuriousTo\uA75Bvald",
         }
         // key inputs that bufIndex collides (end compose and accept incoming char as a new char state)
         else if (states.buf[bufIndex] !== undefined) {
+            let oldstr = bufAssemble(1)
             reset()
             states.buf[bufIndex] = s
-//            let newbufstr = bufDebugStringify(states.buf)
-//            console.log(`sending out: ${newbufstr}`)
-            return ["0", bufAssemble()]
+//            console.log(`sending bufout: 1,${oldstr} ${bufDebugStringify(states.buf)}`)
+            return ["1", oldstr + bufAssemble()]
         }
         else {
-            let bufferEmpty = (states.buf[0] === undefined)
+            let bufferEmpty = isBufferEmpty(states.buf)
             states.buf[bufIndex] = s
 
             if (bufferEmpty) {
@@ -474,10 +479,14 @@ return Object.freeze({"n":"신세벌식 P2","v":"one","c":"CuriousTo\uA75Bvald",
 //        console.log(`assem-digraph: ${bufDebugStringify(states.buf)} -> 1,${bufAssemble()}`)
         return ["1", bufAssemble()]
     }
-    else {
+    else if (isBufferNotEmpty(states.buf)) {
+        let oldstr = bufAssemble(1)
         reset()
-        // directly print out the character without using the buffer
-//        console.log(`sending1 out: ${s}`)
+//        console.log(`sending1 out: 1,${oldstr}${s}`)
+        return ["1", oldstr + s]
+    }
+    else {
+//        console.log(`sending0 out: 0,${s}`)
         return ["0", s]
     }
 },
@@ -507,7 +516,7 @@ return Object.freeze({"n":"신세벌식 P2","v":"one","c":"CuriousTo\uA75Bvald",
 },
 "end":()=>{
 //    console.log(`end composing`)
-    let ret = bufAssemble()
+    let ret = bufAssemble(1)
     reset()
     return ret
 },
diff --git a/assets/keylayout/ru_ru_jcuken.ime b/assets/keylayout/ru_ru_jcuken.ime
index 4c743d03d..c81567110 100644
--- a/assets/keylayout/ru_ru_jcuken.ime
+++ b/assets/keylayout/ru_ru_jcuken.ime
@@ -260,7 +260,7 @@ let reset = () => {
 }
 let inRange = (s,a,b) => (a <= s && s <= b)
 let isDiacritics = (s) => s !== undefined && inRange(s.charCodeAt(0), 0x0300, 0x036F)
-return Object.freeze({"n":"Русс. ЙЦУКЕН","v":"none","c":"CuriousTo\uA75Bvald","m":"candidates",
+return Object.freeze({"n":"Русс. ЙЦУКЕН","v":"none","c":"CuriousTo\uA75Bvald","m":"rewrite",
 "t":states.keylayouts.map(it => [it[0],it[1]]),
 // return: [displayed output, composed output]
 "accept":(headkey,shiftin,altgrin)=>{
@@ -270,11 +270,11 @@ return Object.freeze({"n":"Русс. ЙЦУКЕН","v":"none","c":"CuriousTo\uA7
     let s = states.keylayouts[headkey][layer]
 
     if (isDiacritics(s)) {
-        return ['', '']
+        return ['1', '']
     }
     else {
         reset()
-        return ['', s]
+        return ['0', s]
     }
 },
 "backspace":()=>{
diff --git a/src/net/torvald/terrarum/ui/UIItemTextLineInput.kt b/src/net/torvald/terrarum/ui/UIItemTextLineInput.kt
index 43e098804..56d9a0f37 100644
--- a/src/net/torvald/terrarum/ui/UIItemTextLineInput.kt
+++ b/src/net/torvald/terrarum/ui/UIItemTextLineInput.kt
@@ -183,7 +183,7 @@ class UIItemTextLineInput(
             while (cursorX > 0) {
                 cursorX -= 1
                 val charDeleted = textbuf.removeAt(cursorX)
-                printdbg(this, "$dbgprn)charDeleted=${charDeleted.toCharInfo()}")
+//                printdbg(this, "$dbgprn)charDeleted=${charDeleted.toCharInfo()}")
 
                 if (charDeleted !in 0x1160..0x11FF) break
             }
@@ -384,7 +384,10 @@ class UIItemTextLineInput(
     private fun endComposing() {
         getIME()?.let {
             val s = it.endCompose()
-            if (it.config.mode != TerrarumIMEMode.REWRITE) {
+            if (s.isNotEmpty()) {
+                if (it.config.mode == TerrarumIMEMode.REWRITE) {
+                    inputBackspaceOnce(9)
+                }
                 paste(s.toCodePoints())
             }
         }