some updates+fix