Add more languages; fix up existing ones