some last fixes
make last changes