Fixed a couple of things, and removed data for chart (for now)