Folders follow up

Initial follow-up, still some pending
Sorry, my bad here. `description` is in fact required for discussions.