Speed improvements
A little polish for demo