not sure what was edited. nothing big. then going to merge with master(incl dan stuff)