UILabel added, NSMutableDict touched, some updates to existing categories