Attributes

Completed attributes and did some minor fixes. I hope in the future I'll stay cleaner with the branches. We'll see.