mainly fixing retarded problems with the program