Even more final touches