updating some files and trimming down for speed