some errors fixed