use borrowing terminology in invariants; typos