Some speed improvements.
Update graphs and data