Fix example and clean up.  Working raw key/values.