Some changes to the samples. Minor improvements.