last fixes
fixes