fix errors, add expander