fixed all that I forgot to change