- removed a huge slowdown
- added some fixes for folders