some errors fixed2