Final fit and finishing touches