More settings updated and consolidated