Fix labels and tbd

Remove the tbd property.
Label some unlabelled classes / properties