fix tokenization in collocations, and other CSS/JavaScript fixes