fixes based on public-cjk feedback