last changes
fixed some stuff