Word choice change, and bug fix