Included chart and small fixes.