Add 'only one folder' functionality, bugfixes