some last minute tweaks