bugfixes & multiple tweaks (mainly zh / jap)