more devenv and devenv-inner stuff