Property order

Fixing a lot of the property ordering after the changes in #431