Various Changes

Object properties now ordered.  Added some additional items.