some errors has been fixed