Add languages and tidy up.