manually escaped things
added missing auto files