Fixed a few issues w/ example 2