found some errors and changed