charts and bug fixes