config changes and PATH improvement