resolved some errors