some more last changes