add china cal and other fixes