Graph colors match ESK & small bug fixes