fixed ordering, blank entries for classes