make changes and test some more