some last changes that i forgot to commit