settings related improvements