made a lot of good changes