More bugfixes. Added ability to specify a subfolder for the default folder