scj: Modifications of several classes.