Adding new charts, and fixing some bugs