A few final touches