Fixing JRFolder
Numerous improvements