Final touch-ups before build