rich and some fixes