old fixes + expand all