misc changes to ease my testing