fixing all of the problems and condensing files