Will fix in later commit--I'll do the text changes first.