some errors solved
some errors solved