Comment translation and miscellaneous bug corrections