some charts and numbers improvements