fixed some color problems -- see fr commits