ColorRig and bug fixes