changed some chart logic as well as chart display