Historical Chart + bug fixes