Add note to translated words and minor tweaks