made changes all over the place