More testing and tweaked the presentation.