improvements for folders