fixes and updates dependencies, fixes options.config
merge in changes from origin