a couple last tweaks