Folders follow up

Initial follow-up, still some pending
`the folder` here and on the line below