some errors fixed 2