some updates in 0.9