Some final touches