Cleaned up a few bugs from the PR. Updated samples with new conventions.