fixed some things and took out an erronious error