expander improvements a-many