a couple of last minute tweaks