fixes + expander