last changes

some other ajustments