ticket:6 little settings changes