fixed some duplicates and missing attribute definitions