Fixing minor breaks, updating classes.