Update tutorial, update sample with final code