minor edits re: order of property attributes