Folder selection workaround

+ some plotting improvements