fixed errors that came with the changes from the previous commits