fixed parsing and added charts