small changes as Elfi requested