various in-progress changes