ported over changes from David, batched the samples

but still need to check that the links in README.md are pointing to the
correct lines