Shortened and prettied up example and fixed mystery bug with a mystery fix