Mainly kifu path modifications