Fix some quality flaws and support more languages