fixed some of the errors