last fixes before merge