Fix example, cleanups.