some errors fixed
some errors fixed