Further updates to basic settings