a couple last changes...