Changed attributeSet id's and other bugfixes