Update for .9, bug fixes. folder regex, config move