now unwrapps types, added tag css class