fix optional
tweak xml for kimchi