Charts and bug fix