More finishing touches. Down the the wire here