last fixes
commit changes