fixed charts and added more