Update tutorial to reflect the current APIs. Also correct a small omission in