last fixes applied