Re-add some accidentally removed files and change and inflection