Added more charts, bug fix
Added more charting features with fixing bugs and removing unused files.