Fix ordering
Add position
Add color, misc fixes