Updating docs and adding config options