big commit

made a lot of changes