complete translation & fix bugs