Manual Update and Unicode fixes