expand properties, fix expander