fixed some duplicates and missing attribute definitions
Merge pull request #44 from tripzero/master

fixed some duplicates and missing attribute definitions