Fixed charts, added a few thangs