Updates: class systems, fixes