added attributes, and fixing line endings?

hopefully this doesn't destroy everyting!