Improve settings setup (#1).