lots of testing updates/changes