some errors cleaned
some errors cleaned