Tweaks to random class and others