beautify, and move towards 'settings'
1.0.7