Updated fruity and some simplifications.