Few tweaks
Merge branch 'Live-Config'