A few more final touches