made a bunch of changes