fixed some changes I had made to facilitate testing