Added sparkle, along with some cleanup.