some errors were fixed