Last minute tweaks and notes