Minor Settings Touch Ups