fixed some errors ?