updated files

still working out some bugs