last fixes + data