fixed some errors 5