more color adjustments and code changes