some errors resolved