some more final touches