=resolved some errors