updated some files, finished some more problems