Various changed from Jonathan

AHH! Attributes! That is the word I was looking for!