Update language tokens
Minor style and logic fixes