some updates fixed