Improve translations; fix bugs