Added attributes and colors, and fixed a LOT of bugs