Update comments and the sample app