Added chart and other fixes