bug fixes
Merge branch 'fixing_folders'
merge