added charts, other fixes