Bug fix, color tuning