Fix language indicators on cells

fixes #599
fixes #553
fixes #443