added borrows, minor fixes