some errors cleaned