Add some Japanese language rules

This is V2 of this PR which includes fixes for issues I missed the first time.

Just tell me if you want me to change something else.