is_borrowable flag and minor changes