fixed some errors 6