edited somes stuff
more stuff to new branch