Imporoved some lag issues with the demo.