Fixup previous samples and add tutorial 5.