#100: minor language changes