some errors - fixed