changed colors on charts and fixed some minor issues