fixes + export